aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1994-04-19 00:43:06 +0000
committerKarl Heuer1994-04-19 00:43:06 +0000
commit196a7903859d7f25d927e73119d264bca8049b91 (patch)
treed7cb0ef836ffb95298ac5cea8aa146603dbd8f6b
parent3717217eee6d4e0b4871e89980cdae7bf828ab14 (diff)
downloademacs-196a7903859d7f25d927e73119d264bca8049b91.tar.gz
emacs-196a7903859d7f25d927e73119d264bca8049b91.zip
(src/Makefile, lib-src/Makefile): Delete ^L. Fix definition of $undefs.
-rwxr-xr-xconfigure1.in11
1 files changed, 5 insertions, 6 deletions
diff --git a/configure1.in b/configure1.in
index b8fa83ec2a9..b9987e59cf6 100755
--- a/configure1.in
+++ b/configure1.in
@@ -1577,10 +1577,9 @@ changequote(,)dnl The horror, the horror.
1577# the C preprocessor to some helpful value like 1, or maybe the empty 1577# the C preprocessor to some helpful value like 1, or maybe the empty
1578# string. Needless to say consequent macro substitutions are less 1578# string. Needless to say consequent macro substitutions are less
1579# than conducive to the makefile finding the correct directory. 1579# than conducive to the makefile finding the correct directory.
1580undefs="`echo $top_srcdir $configuration | 1580undefs="`echo $top_srcdir $configuration |
1581sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/ */ -U/g' \ 1581sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
1582 -e 's/ -U$//' -e 's/^[^ ]/-U/' \ 1582 -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \
1583 -e 's/-U[0-9][^ ]*//g' \
1584`" 1583`"
1585changequote([,])dnl 1584changequote([,])dnl
1586 1585
@@ -1591,7 +1590,7 @@ echo creating lib-src/Makefile
1591 -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ 1590 -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
1592 < Makefile.in > junk.c 1591 < Makefile.in > junk.c
1593 $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | 1592 $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
1594 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new 1593 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new
1595 rm -f junk.c 1594 rm -f junk.c
1596 chmod 444 Makefile.new; 1595 chmod 444 Makefile.new;
1597 mv -f Makefile.new Makefile; 1596 mv -f Makefile.new Makefile;
@@ -1604,7 +1603,7 @@ echo creating src/Makefile
1604 -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ 1603 -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
1605 < Makefile.in > junk.c 1604 < Makefile.in > junk.c
1606 $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | 1605 $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
1607 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new 1606 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new
1608 rm -f junk.c 1607 rm -f junk.c
1609 chmod 444 Makefile.new; 1608 chmod 444 Makefile.new;
1610 mv -f Makefile.new Makefile; 1609 mv -f Makefile.new Makefile;