From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Mon, 10 Jun 2002 09:49:21 +0000 (+0000)
Subject: * Makefile.am (maintainer-check): Fix $MAKE -e detection.
X-Git-Tag: Release-1-6b~77
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=23e1690295dc0f49c76336bab7d7aad4c5f514bb;p=automake.git

* Makefile.am (maintainer-check): Fix $MAKE -e detection.
* tests/yacc7.test: Use rm -f.
---

diff --git a/ChangeLog b/ChangeLog
index 5b1b6a07..16b5dc2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-10  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* Makefile.am (maintainer-check): Fix $MAKE -e detection.
+	* tests/yacc7.test: Use rm -f.
+
 2002-06-10  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* tests/defs (ACLOCAL, AUTOMAKE): Use absolute paths.
diff --git a/Makefile.am b/Makefile.am
index c4685258..42fd5bf1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,7 +192,7 @@ maintainer-check: automake aclocal
 	fi
 ## On NetBSD (1.5) and OSF, the $SHELL variable is still inherited from
 ## the environment.
-	@if grep '$$MAKE.*-e' $(srcdir)/tests/*.test | grep -v '-e.*SHELL' ; then \
+	@if grep '$$MAKE.* -e' $(srcdir)/tests/*.test | grep -v '-e.*SHELL' ; then \
 	  echo 'Always overwrite SHELL when using "$$MAKE -e".' 1>&2; \
 	  echo 'Use "$$MAKE -e SHELL=/bin/sh" in the above lines.' 1>&2; \
 	  exit 1; \
diff --git a/Makefile.in b/Makefile.in
index 67c220cf..ea20fcaf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
@@ -146,24 +147,25 @@ automake: $(top_builddir)/config.status automake.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 aclocal: $(top_builddir)/config.status aclocal.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f="`echo $$p|sed '$(transform)'`"; \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
-	  elif test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  if test -f $$d$$p; then \
+	    f="`echo $$f|sed '$(transform)'`"; \
+	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f="`echo $$p|sed '$(transform)'`"; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f="`echo $$f|sed '$(transform)'`"; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
@@ -709,7 +711,7 @@ maintainer-check: automake aclocal
 	  echo 'it is more portable.' 1>&2; \
 	  exit 1; \
 	fi
-	@if grep '$$MAKE.*-e' $(srcdir)/tests/*.test | grep -v '-e.*SHELL' ; then \
+	@if grep '$$MAKE.* -e' $(srcdir)/tests/*.test | grep -v '-e.*SHELL' ; then \
 	  echo 'Always overwrite SHELL when using "$$MAKE -e".' 1>&2; \
 	  echo 'Use "$$MAKE -e SHELL=/bin/sh" in the above lines.' 1>&2; \
 	  exit 1; \
diff --git a/tests/yacc7.test b/tests/yacc7.test
index 7b474a73..750692df 100755
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -47,7 +47,7 @@ $MAKE check-dist || exit 1
 
 # We should be able to recover if foo.h is deleted.
 
-rm foo.h || exit 1
+rm -f foo.h || exit 1
 $MAKE foo.h || exit 1
 test -f foo.h || exit 1