From 5cbf8cd65c24c8a1a6973654b77cdee5cb7c6522 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 10 Dec 1995 19:13:53 +0000 Subject: [PATCH] Can't use 'true' in Makefiles --- ChangeLog | 5 +++++ Makefile.am | 4 ++++ Makefile.in | 4 ++++ lib/am/Makefile.am | 4 ++++ lib/am/texinfos.am | 7 ++++--- texinfos.am | 7 ++++--- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ce13705..d6531f5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Dec 10 11:59:33 1995 Tom Tromey + + * Makefile.am (check-local): Check for 'true' in source. + * texinfos.am (install-info): Can't use "true" in any rule. + Sat Dec 9 10:16:48 1995 Tom Tromey * Makefile.am (cvs-dist): New target. diff --git a/Makefile.am b/Makefile.am index 7f23cc3d..aad64943 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,10 @@ ETAGS_ARGS = automake.in --lang=none \ # The simplest form of checking. check-local: automake @PERL@ -c -w automake + if grep '^[^#].*true' *.am; then :; else \ + echo "can't use 'true' in GNU Makefile" 1>&2; \ + exit 1; \ + fi automake: automake.in CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status diff --git a/Makefile.in b/Makefile.in index b7356d04..a81f03f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -293,6 +293,10 @@ maintainer-clean: distclean maintainer-clean-binSCRIPTS maintainer-clean-vti mai # The simplest form of checking. check-local: automake @PERL@ -c -w automake + if grep '^[^#].*true' *.am; then :; else \ + echo "can't use 'true' in GNU Makefile" 1>&2; \ + exit 1; \ + fi automake: automake.in CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index 7f23cc3d..aad64943 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -26,6 +26,10 @@ ETAGS_ARGS = automake.in --lang=none \ # The simplest form of checking. check-local: automake @PERL@ -c -w automake + if grep '^[^#].*true' *.am; then :; else \ + echo "can't use 'true' in GNU Makefile" 1>&2; \ + exit 1; \ + fi automake: automake.in CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index de68ff5c..489f6efa 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -19,12 +19,13 @@ install-info: $(INFO_DEPS) for ifile in $${file}*; do \ $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \ done; \ -## We need the 'else true' because in some broken versions of sh 'if' -## will return false if the test fails. +## We need the 'else' because in some broken versions of sh 'if' will +## return false if the test fails. We use ':' because the GNU +## standards prohibit us from using 'true'. ## FIXME no one has install-info, so for now we just comment it out. ## if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ ## install-info --infodir=$(infodir) $$d/$$file; \ -## else true; fi; \ +## else :; fi; \ done uninstall-info: diff --git a/texinfos.am b/texinfos.am index de68ff5c..489f6efa 100644 --- a/texinfos.am +++ b/texinfos.am @@ -19,12 +19,13 @@ install-info: $(INFO_DEPS) for ifile in $${file}*; do \ $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \ done; \ -## We need the 'else true' because in some broken versions of sh 'if' -## will return false if the test fails. +## We need the 'else' because in some broken versions of sh 'if' will +## return false if the test fails. We use ':' because the GNU +## standards prohibit us from using 'true'. ## FIXME no one has install-info, so for now we just comment it out. ## if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ ## install-info --infodir=$(infodir) $$d/$$file; \ -## else true; fi; \ +## else :; fi; \ done uninstall-info: -- 2.43.5