Be less sensitive to spaces in Makefile.in. Kills bug #556.

diff --git a/ChangeLog b/ChangeLog
index dd336b28e19466eb7ef2ec1945da0651ac3d0ccf..0cca85184e04a3d688f6f00263f5062849e159c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 27 16:26:47 1991  K. Richard Pixley  (rich at cygnus.com)
+
+       * configure: be less sensitive to spaces in Makefile.in.
+
 Thu Dec 26 16:30:26 1991  K. Richard Pixley  (rich at cygnus.com)
 
        * cfg-paper.texi: some changes suggested by rms.

diff --git a/configure b/configure
index b2ad6022a41675e803f383bfd6d38aa12c841043..f91c85130973ec60a3adf7662f0a33df85514daa 100755 (executable)
--- a/configure
+++ b/configure
@@ -658,27 +658,27 @@ for host in ${hosts} ; do
                        mv Makefile.tem ${Makefile}
 
                        # set srcdir
-                       sed "s@^srcdir = \.@srcdir = ${srcdir}@" ${Makefile} > Makefile.tem
+                       sed "s@^srcdir[         ]*=.*$@srcdir = ${srcdir}@" ${Makefile} > Makefile.tem
                        mv Makefile.tem ${Makefile}
 
                        # set prefix
                        if [ -n "${prefix}" ] ; then
-                               sed "s:^prefix =.*$:prefix = ${prefix}:" ${Makefile} > Makefile.tem
+                               sed "s:^prefix[         ]*=.*$:prefix = ${prefix}:" ${Makefile} > Makefile.tem
                                mv Makefile.tem ${Makefile}
                        fi
 
                        # set datadir
                        if [ -n "${datadir}" ] ; then
-                               sed "s:^datadir =.*$:datadir = ${datadir}:" ${Makefile} > Makefile.tem
+                               sed "s:^datadir[        ]*=.*$:datadir = ${datadir}:" ${Makefile} > Makefile.tem
                                mv Makefile.tem ${Makefile}
                        fi
 
                        # reset SUBDIRS
-                       sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
+                       sed "s:^SUBDIRS[        ]*=.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
                        mv Makefile.tem ${Makefile}
 
                        # reset NONSUBDIRS
-                       sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
+                       sed "s:^NONSUBDIRS[     ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
                        mv Makefile.tem ${Makefile}
 
                        # remove any form feeds.