[Orca-checkins] r379 - in trunk/orca/data_gatherers: aix hp orca_services orcallator procallator winallator

[Blair Zajac]

Author: blair
Date: Wed Jul 28 22:46:43 2004
New Revision: 379

Modified:
   trunk/orca/data_gatherers/aix/Makefile.in
   trunk/orca/data_gatherers/hp/Makefile.in
   trunk/orca/data_gatherers/orca_services/Makefile.in
   trunk/orca/data_gatherers/orcallator/Makefile.in
   trunk/orca/data_gatherers/procallator/Makefile.in
   trunk/orca/data_gatherers/winallator/Makefile.in
Log:
Some shells invoked by make cannot handle the case when there are no
elements in a for loop, i.e. for f in; do.  Bug noted by Jon
Tankersley <jon.tankersley at eds.com>.

* data_gatherers/aix/Makefile.in (install),
* data_gatherers/hp/Makefile.in (install),
* data_gatherers/orcallator/Makefile.in (install),
* data_gatherers/orca_services/Makefile.in (install),
* data_gatherers/procallator/Makefile.in (install),
* data_gatherers/winallator/Makefile.in (install):
  Before using a make variable in a for loop, test that it has
  non-zero length.


Modified: trunk/orca/data_gatherers/aix/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/aix/Makefile.in	(original)
+++ trunk/orca/data_gatherers/aix/Makefile.in	Wed Jul 28 22:46:43 2004
@@ -35,10 +35,12 @@
 
 install: all
 	$(MKDIR) $(bindir)
-	@for file in $(BIN_TARGETS); do \
-	  echo $(INSTALL) $$file $(bindir); \
-	  $(INSTALL) $$file $(bindir); \
-	done
+	@if test "$(BIN_TARGETS)"; then \
+	  for file in $(BIN_TARGETS); do \
+	    echo $(INSTALL) $$file $(bindir); \
+	    $(INSTALL) $$file $(bindir); \
+	  done; \
+	fi
 
 clean:
 	$(RM) $(TARGETS)

Modified: trunk/orca/data_gatherers/hp/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/hp/Makefile.in	(original)
+++ trunk/orca/data_gatherers/hp/Makefile.in	Wed Jul 28 22:46:43 2004
@@ -35,10 +35,12 @@
 
 install: all
 	$(MKDIR) $(bindir)
-	@for file in $(BIN_TARGETS); do \
-	  echo $(INSTALL) $$file $(bindir); \
-	  $(INSTALL) $$file $(bindir); \
-	done
+	@if test "$(BIN_TARGETS)"; then \
+	  for file in $(BIN_TARGETS); do \
+	    echo $(INSTALL) $$file $(bindir); \
+	    $(INSTALL) $$file $(bindir); \
+	  done; \
+	fi
 
 clean:
 	$(RM) $(TARGETS)

Modified: trunk/orca/data_gatherers/orca_services/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/Makefile.in	(original)
+++ trunk/orca/data_gatherers/orca_services/Makefile.in	Wed Jul 28 22:46:43 2004
@@ -47,14 +47,18 @@
 	$(MKDIR) $(sysconfdir)
 	$(MKDIR) $(RAW_ORCA_SERVICES_DIR)
 	$(MKDIR) $(RRD_ORCA_SERVICES_DIR)
-	@for file in $(BIN_TARGETS); do \
-	  echo $(INSTALL) $$file $(bindir); \
-	  $(INSTALL) $$file $(bindir); \
-	done
-	@for file in $(LIBEXEC_TARGETS); do \
-	  echo $(INSTALL) $$file $(libexecdir); \
-	  $(INSTALL) $$file $(libexecdir); \
-	done
+	@if test "$(BIN_TARGETS)"; then \
+	  for file in $(BIN_TARGETS); do \
+	    echo $(INSTALL) $$file $(bindir); \
+	    $(INSTALL) $$file $(bindir); \
+	  done; \
+	fi
+	@if test "$(LIBEXEC_TARGETS)"; then \
+	  for file in $(LIBEXEC_TARGETS); do \
+	    echo $(INSTALL) $$file $(libexecdir); \
+	    $(INSTALL) $$file $(libexecdir); \
+	  done; \
+	fi
 	@if test -r $(sysconfdir)/orca_services.cfg; then \
 	  date="`date +%Y-%m-%d-%H:%M:%S`"; \
 	  echo $(INSTALL) -m 0644 orca_services.cfg $(sysconfdir)/orca_services.cfg.$$date; \

Modified: trunk/orca/data_gatherers/orcallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/Makefile.in	(original)
+++ trunk/orca/data_gatherers/orcallator/Makefile.in	Wed Jul 28 22:46:43 2004
@@ -48,10 +48,12 @@
 	$(MKDIR) $(sysconfdir)
 	$(MKDIR) $(RAW_ORCALLATOR_DIR)
 	$(MKDIR) $(RRD_ORCALLATOR_DIR)
-	@for file in $(BIN_TARGETS); do \
-	  echo $(INSTALL) $$file $(bindir); \
-	  $(INSTALL) $$file $(bindir); \
-	done
+	@if test "$(BIN_TARGETS)"; then \
+	  for file in $(BIN_TARGETS); do \
+	    echo $(INSTALL) $$file $(bindir); \
+	    $(INSTALL) $$file $(bindir); \
+	  done; \
+	fi
 	$(INSTALL) -m 0644 orcallator.se $(libdir)
 	@if test -r $(sysconfdir)/orcallator.cfg; then \
 	  date="`date +%Y-%m-%d-%H:%M:%S`"; \

Modified: trunk/orca/data_gatherers/procallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/procallator/Makefile.in	(original)
+++ trunk/orca/data_gatherers/procallator/Makefile.in	Wed Jul 28 22:46:43 2004
@@ -44,10 +44,12 @@
 	$(MKDIR) $(bindir)
 	$(MKDIR) $(RAW_PROCALLATOR_DIR)
 	$(MKDIR) $(RRD_PROCALLATOR_DIR)
-	@for file in $(BIN_TARGETS); do \
-	  echo $(INSTALL) $$file $(bindir); \
-	  $(INSTALL) $$file $(bindir); \
-	done
+	@if test "$(BIN_TARGETS)"; then \
+	  for file in $(BIN_TARGETS); do \
+	    echo $(INSTALL) $$file $(bindir); \
+	    $(INSTALL) $$file $(bindir); \
+	  done; \
+	fi
 	@if test -r $(sysconfdir)/procallator.cfg; then \
 	  date="`date +%Y-%m-%d-%H:%M:%S`"; \
 	  echo $(INSTALL) -m 0644 procallator.cfg $(sysconfdir)/procallator.cfg.$$date; \

Modified: trunk/orca/data_gatherers/winallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/winallator/Makefile.in	(original)
+++ trunk/orca/data_gatherers/winallator/Makefile.in	Wed Jul 28 22:46:43 2004
@@ -42,10 +42,12 @@
 	$(MKDIR) $(sysconfdir)
 	$(MKDIR) $(RAW_WINALLATOR_DIR)
 	$(MKDIR) $(RRD_WINALLATOR_DIR)
-	@for file in $(BIN_TARGETS); do \
-	  echo $(INSTALL) $$file $(bindir); \
-	  $(INSTALL) $$file $(bindir); \
-	done
+	@if test "$(BIN_TARGETS)"; then \
+	  for file in $(BIN_TARGETS); do \
+	    echo $(INSTALL) $$file $(bindir); \
+	    $(INSTALL) $$file $(bindir); \
+	  done; \
+	fi
 	@if test -r $(sysconfdir)/winallator.cfg; then \
 	  date="`date +%Y-%m-%d-%H:%M:%S`"; \
 	  echo $(INSTALL) -m 0644 winallator.cfg $(sysconfdir)/winallator.cfg.$$date; \