components/Makefile
changeset 38 cd00ea74156e
parent 34 d20b10eba317
child 53 e398cb2c4b45
--- a/components/Makefile	Fri Oct 15 16:14:01 2010 -0500
+++ b/components/Makefile	Fri Oct 15 16:15:38 2010 -0500
@@ -39,20 +39,21 @@
 include components.mk
 
 
-download:	TARGET = download
-prep:		TARGET = prep
-build:		TARGET = build
-install:	TARGET = install
-publish:	TARGET = publish
-validate:	TARGET = validate
-clean:		TARGET = clean
-clobber:	TARGET = clobber
+download:		TARGET = download
+prep:			TARGET = prep
+build:			TARGET = build
+install:		TARGET = install
+publish:		TARGET = publish
+install-packages:	TARGET = install-packages
+validate:		TARGET = validate
+clean:			TARGET = clean
+clobber:		TARGET = clobber
 prep build install publish:		TEMPLATE_ZONE=$(ZONE)
 prep build install publish:		LOG = >$(WS_LOGS)/$@.$(TARGET).log 2>&1
 
 .DEFAULT:	publish
 
-download prep build install publish validate: $(COMPONENT_DIRS)
+download prep build install publish install-packages validate: $(COMPONENT_DIRS)
 
 COMPONENT_DIRS.nosetup =	$(COMPONENT_DIRS:%=%.nosetup)
 
@@ -82,14 +83,14 @@
 	echo "export PATH WS_TOP" >>$@
 
 $(COMPONENT_DIRS):	setup FORCE
-	@cd $@ ; echo "$(TARGET) $@" ; \
+	@cd $@ && echo "$(TARGET) $@" && \
 	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
-	 		 $(@:%=--component %) --make $(TARGET) $(LOG)
+			 $(@:%=--component %) --make $(TARGET) $(LOG)
 
 $(COMPONENT_DIRS.nosetup):	FORCE
-	@cd $(@:%.nosetup=%) ; echo "$(TARGET) $(@:%.nosetup=%)" ; \
+	@cd $(@:%.nosetup=%) && echo "$(TARGET) $(@:%.nosetup=%)" && \
 	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
-	 		 $(@:%.nosetup=--component %) --make $(TARGET) $(LOG)
+			 $(@:%.nosetup=--component %) --make $(TARGET) $(LOG)
 
 # depends.mk is auto-generated by the build tools, bass-o-matic.py in particular
 depends.mk:	components.mk