INN commit: trunk (Makefile site/Makefile)

[INN Commit]

    Date: Thursday, April 23, 2015 @ 10:35:49
  Author: iulius
Revision: 9829

Remove unused code (the MOST variable is no longer set)

Also add quotes around echo'ed text (otherwise, two consecutives spaces are
not displayed).

Change how the test for the emptiness of the variable $D is done;
make was exiting if the variable is set.

Modified:
  trunk/Makefile
  trunk/site/Makefile

---------------+
 Makefile      |   20 +++++++++++---------
 site/Makefile |   19 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2015-04-23 14:51:16 UTC (rev 9828)
+++ Makefile	2015-04-23 17:35:49 UTC (rev 9829)
@@ -112,15 +112,17 @@
 	    echo '' ; \
 	    cd $$D && $(MAKE) install || exit 1 ; cd .. ; \
 	done
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHAUTHPASSWD)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHBIN)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHDOC)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHETC)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade ${PATHFILTER}
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN1)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN3)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN5)
-	test -z "$D" && $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN8)
+	if [ -z "$D" ] ; then \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHAUTHPASSWD) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHBIN) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHDOC) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(PATHETC) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade ${PATHFILTER} ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN1) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN3) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN5) ; \
+	    $(PERL) -Tw $(PATHBIN)/innupgrade $(MAN8) ; \
+	fi
 
 install-root:
 	@chmod +x support/install-sh

Modified: site/Makefile
===================================================================
--- site/Makefile	2015-04-23 14:51:16 UTC (rev 9828)
+++ site/Makefile	2015-04-23 17:35:49 UTC (rev 9829)
@@ -73,7 +73,7 @@
 	ovdb.conf active.minimal \
 	newsgroups.minimal send-uucp.cf subscriptions
 
-ALL		= $(MOST) $(REST)
+ALL		= $(REST)
 
 REST_INSTALLED	= \
 	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
@@ -100,7 +100,7 @@
 	$D$(PATH_OVDB_CONF) \
 	$D$(PATH_SENDUUCP_CF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS)
 
-ALL_INSTALLED	= $(MOST_INSTALLED) $(REST_INSTALLED)
+ALL_INSTALLED	= $(REST_INSTALLED)
 
 SPECIAL		= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
 		$D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
@@ -108,9 +108,6 @@
 ##  Get new versions of everything from samples directory.
 all:		$(ALL) config
 
-##  Get only scripts, not per-host config files.
-most:		$(MOST)
-
 ##  Show changes between files here and ones in samples.
 diff:
 	@$(MAKE) COPY=-${DIFF} all
@@ -132,10 +129,10 @@
 install-config:		update $(REST_INSTALLED) $(SPECIAL)
 
 ##  Install scripts, not per-host config files.
-update:		all $(MOST_INSTALLED)
-	@echo "" ; echo inn.conf in site directory may have newly added parameters
-	@echo which installed inn.conf does not have.  Check those parameters
-	@echo before you run innd. ; echo ""
+update:		all
+	@echo '' ; echo 'inn.conf in site directory may have newly added parameters'
+	@echo 'which installed inn.conf does not have.  Check those parameters'
+	@echo 'before you run innd.' ; echo ''
 	date >update
 
 ##  Special rules for files that should never be overwritten if they are
@@ -153,7 +150,9 @@
 	chown $(RUNASUSER) $@
 	chgrp $(RUNASGROUP) $@
 	chmod $(FILEMODE) $@
-	test -z "$D" && $(PATHBIN)/makedbz -i -o
+	if [ -z "$D" ] ; then \
+	    $(PATHBIN)/makedbz -i -o ; \
+	fi
 
 bootstrap: