By default, do not install hostname anymore; no kidding, this time.

* src/Makefile.am (EXTRA_PROGRAMS): Remove hostname from this list,
now that it's no longer being installed by default.  This should
have been part of the 2007-08-21 change.
(check-duplicate-no-install): New rule to ensure this doesn't
happen again.
(check): Depend on it.

diff --git a/ChangeLog b/ChangeLog
index 62bcc74a2f48d6c8bb71c3257ea4085912ad8d79..d2da407daf0a3392600c24928ac2a9776c7cdc62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-08-28  Jim Meyering  <jim@meyering.net>
 
+       By default, do not install hostname anymore; no kidding, this time.
+       * src/Makefile.am (EXTRA_PROGRAMS): Remove hostname from this list,
+       now that it's no longer being installed by default.  This should
+       have been part of the 2007-08-21 change.
+       (check-duplicate-no-install): New rule to ensure this doesn't
+       happen again.
+       (check): Depend on it.
+
        Reflect renaming: mreadlink-with-size -> areadlink-with-size.
        * bootstrap.conf: Update module name.
        * src/copy.c (copy_internal): Update header and function names.

diff --git a/src/Makefile.am b/src/Makefile.am
index 43f138c0497dfeb440f3dd56d8b204ecf5b9728b..6d652a6665c2a74fb4c447ab9efad76c9c8b9747 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_PROGRAMS = \
   nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
   shuf sort split sum tac tail tr tsort unexpand uniq wc \
   basename date dirname echo env expr factor false \
-  hostname id kill logname pathchk printenv printf pwd \
+  id kill logname pathchk printenv printf pwd \
   runcon seq sleep tee \
   test true tty whoami yes \
   base64
@@ -300,7 +300,7 @@ pm = progs-makefile
 pr = progs-readme
 # Ensure that the list of programs in README matches the list
 # of programs we can build.
-check: check-README check-misc
+check: check-README check-misc check-duplicate-no-install
 .PHONY: check-README
 check-README:
        rm -rf $(pr) $(pm)
@@ -311,6 +311,13 @@ check-README:
          | sed -n '/^   */s///p' | tr -s ' ' '\n' > $(pr)
        diff $(pm) $(pr) && rm -rf $(pr) $(pm)
 
+# Ensure that a by-default-not-installed program (listed in
+# $(no_install__progs) is not also listed in $(EXTRA_PROGRAMS), because
+# if that were to happen, it *would* be installed by default.
+.PHONY: check-duplicate-no-install
+check-duplicate-no-install: tr
+       test -z "`echo '$(EXTRA_PROGRAMS)'| ./tr ' ' '\n' | uniq -d`"
+
 # Ensure that the list of programs and author names is accurate.
 au_dotdot = authors-dotdot
 au_actual = authors-actual