From 053ff48e2977b56f9089b1cf804d39c4c19b6f1c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 3 Jan 1996 07:26:18 +0000
Subject: [PATCH] Various bug fixes

---
 ChangeLog          | 14 ++++++++++++++
 Makefile.in        |  6 +++---
 automake.in        |  5 +++--
 depend.am          |  6 +++++-
 lib/am/depend.am   |  6 +++++-
 lib/am/texinfos.am |  4 ++--
 texinfos.am        |  4 ++--
 7 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1abcb69b..6b126929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
+Wed Jan  3 00:05:40 1996  Tom Tromey  <tromey@cambric.colorado.edu>
+
+	* depend.am ($(srcdir)/.deps/%.P): Must regexp-quote srcdir in sed
+	invocation.
+
+	* automake.in (initialize_global_constants): Don't quote "@" in
+	$install_man_format.
+	(handle_merge_targets): use "@:" as empty command, not ":".
+
 Tue Jan  2 23:33:24 1996  Tom Tromey  <tromey@cambric.colorado.edu>
 
+	* texinfos.am (install-info): Look in $d for info files.  From
+	François Pinard.
+
+	* depend.am ($(srcdir)/.deps/%.P): Fixed regexp.
+
 	* automake.in (read_am_file): Correctly deal with continued
 	variable definitions.
 
diff --git a/Makefile.in b/Makefile.in
index 8e6e7749..1b858ad0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -144,8 +144,8 @@ install-info: $(INFO_DEPS)
 	  else					\
 	    d=$(srcdir);			\
 	  fi;					\
-	  for ifile in $${file}*; do		\
-	    $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+	  for ifile in `cd $$d && echo $${file}*`; do \
+	    $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
 	  done;					\
 	done
 
@@ -241,7 +241,7 @@ install-exec: install-binSCRIPTS
 install-data: install-info install-pkgdataDATA
 
 install: install-exec install-data
-	:
+	@:
 
 uninstall: uninstall-binSCRIPTS uninstall-info uninstall-pkgdataDATA
 
diff --git a/automake.in b/automake.in
index 069cc9d9..4a13dc42 100755
--- a/automake.in
+++ b/automake.in
@@ -938,7 +938,8 @@ sub handle_merge_targets
 
     $output_rules .= ('install: '
 		      . join (' ', @install)
-		      . "\n\t:"
+		      # Use "@:" as empty command so nothing prints.
+		      . "\n\t\@:"
 		      . "\n\n"
 		      . 'uninstall: '
 		      . join (' ', @uninstall)
@@ -1269,7 +1270,7 @@ sub initialize_global_constants
 
     # Helper text for dealing with man pages.
     $install_man_format =
-    '	\@sect=@SECTION@;				\\
+    '	@sect=@SECTION@;				\\
 	inst=`echo "@MANBASE@" | sed \'$(transform)\'`.@FULLSECT@; \\
 	echo installing @MAN@ as $(mandir)/man$$sect/$$inst; \\
 	$(INSTALL_DATA) $(srcdir)/@MAN@ $(mandir)/man$$sect/$$inst
diff --git a/depend.am b/depend.am
index 2ebc5d6c..6f87be27 100644
--- a/depend.am
+++ b/depend.am
@@ -22,7 +22,11 @@ $(DEP_FILES): $(srcdir)/.deps/.P
 
 $(srcdir)/.deps/%.P: $(srcdir)/%.c
 	@echo "mkdeps $< > $@"
-	@$(MKDEP) $< | sed 's,$(srcdir)/,,g' > $@-tmp
+## Need \< in regexp because otherwise when srcdir=. too much can be
+## matched.  Also we regexp-quote srcdir because "." is a matching
+## operator, and commonly appears in filenames.
+	@re=`echo 's,\<$(srcdir),,g' | sed 's/\./\\./g'`; \
+	  $(MKDEP) $< | sed $$re > $@-tmp
 	@mv $@-tmp $@
 
 # End of maintainer-only section
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 2ebc5d6c..6f87be27 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -22,7 +22,11 @@ $(DEP_FILES): $(srcdir)/.deps/.P
 
 $(srcdir)/.deps/%.P: $(srcdir)/%.c
 	@echo "mkdeps $< > $@"
-	@$(MKDEP) $< | sed 's,$(srcdir)/,,g' > $@-tmp
+## Need \< in regexp because otherwise when srcdir=. too much can be
+## matched.  Also we regexp-quote srcdir because "." is a matching
+## operator, and commonly appears in filenames.
+	@re=`echo 's,\<$(srcdir),,g' | sed 's/\./\\./g'`; \
+	  $(MKDEP) $< | sed $$re > $@-tmp
 	@mv $@-tmp $@
 
 # End of maintainer-only section
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 7fb2d5a4..34992b79 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -16,8 +16,8 @@ install-info: $(INFO_DEPS)
 	    d=$(srcdir);			\
 	  fi;					\
 ## This ${...} is in the shell, not in make.
-	  for ifile in $${file}*; do		\
-	    $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+	  for ifile in `cd $$d && echo $${file}*`; do \
+	    $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
 	  done;					\
 ## We need the 'else' because in some broken versions of sh 'if' will
 ## return false if the test fails.  We use ':' because the GNU
diff --git a/texinfos.am b/texinfos.am
index 7fb2d5a4..34992b79 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -16,8 +16,8 @@ install-info: $(INFO_DEPS)
 	    d=$(srcdir);			\
 	  fi;					\
 ## This ${...} is in the shell, not in make.
-	  for ifile in $${file}*; do		\
-	    $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+	  for ifile in `cd $$d && echo $${file}*`; do \
+	    $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
 	  done;					\
 ## We need the 'else' because in some broken versions of sh 'if' will
 ## return false if the test fails.  We use ':' because the GNU
-- 
2.43.5