From 6fd2189582168f7d399ca4d6f512c16e4c43c88f Mon Sep 17 00:00:00 2001 From: "David J. MacKenzie" Date: Mon, 19 Sep 1994 23:03:01 +0000 Subject: [PATCH] works on fileutils --- automake.in | 13 ++++++++----- lib/am/mans.am | 2 +- mans.am | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/automake.in b/automake.in index d341a731..613ec36e 100755 --- a/automake.in +++ b/automake.in @@ -27,8 +27,6 @@ fi am_status=0 AM_DIR=`echo $0|sed s%automake%%` -am_grep_assign='^[ ]*[A-Za-z_][A-Za-z0-9_]*[ ]*=' - # Remove \newline. am_rmnl=/tmp/am.sed1 cat > $am_rmnl <<\EOF @@ -53,7 +51,11 @@ am_ass=/tmp/am.sed2 cat > $am_ass <<\EOF s/(/{/g s/)/}/g -s/^ *\([a-zA-Z_][a-zA-Z0-9_]*\):.*/target_\1=explicit/p +/^ *\([a-zA-Z_.][a-zA-Z0-9_.]*\):.*/{ +s//target_\1=explicit/ +s/\./_/g +p +} s/^ *\([A-Z][A-Z0-9_]*\)[ ]*=[ ]*\(.*\)/\1='\2'/p EOF @@ -176,8 +178,9 @@ ${am_file}_OBJECTS = ${am_file}.o" >&4 # mkdep -a -f ${am_makefile}.in $DEFS $INCLUDES $CPPFLAGS $CFLAGS $SOURCES # fi - cat ${am_makefile}.vars ${am_makefile}.am ${am_makefile}.rules \ - > ${am_makefile}.in + sed '/^ *\([a-zA-Z_.][a-zA-Z0-9_.]*\):.*/,$d' ${am_makefile}.am >> ${am_makefile}.vars + sed -n '/^ *\([a-zA-Z_.][a-zA-Z0-9_.]*\):.*/,$p' ${am_makefile}.am >> ${am_makefile}.rules + cat ${am_makefile}.vars ${am_makefile}.rules > ${am_makefile}.in rm -f ${am_makefile}.vars ${am_makefile}.rules done diff --git a/lib/am/mans.am b/lib/am/mans.am index 11c0cfd2..350a0a5f 100644 --- a/lib/am/mans.am +++ b/lib/am/mans.am @@ -5,7 +5,7 @@ install-man: sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \ inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \ mdir=$(mandir)/man$$sect; \ - $(top_srcdir)/mkinstalldirs $(mdir); \ + $(top_srcdir)/mkinstalldirs $$mdir; \ echo installing $$man as $$mdir/$$inst; \ $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \ cdir=$(mandir)/cat$$sect; \ diff --git a/mans.am b/mans.am index 11c0cfd2..350a0a5f 100644 --- a/mans.am +++ b/mans.am @@ -5,7 +5,7 @@ install-man: sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \ inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \ mdir=$(mandir)/man$$sect; \ - $(top_srcdir)/mkinstalldirs $(mdir); \ + $(top_srcdir)/mkinstalldirs $$mdir; \ echo installing $$man as $$mdir/$$inst; \ $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \ cdir=$(mandir)/cat$$sect; \ -- 2.43.5