thomas: server Makefile,1.19,1.19.2.1

cvs at kolab.org cvs at kolab.org
Mon Jul 16 18:52:35 CEST 2007


Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2879

Modified Files:
      Tag: kolab_2_1_branch
	Makefile 
Log Message:
Make global Makefile abort on errors in for loop, use make -C instead of cd.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- Makefile	11 Jul 2007 14:38:06 -0000	1.19
+++ Makefile	16 Jul 2007 16:52:33 -0000	1.19.2.1
@@ -24,14 +24,14 @@
 dist:
 	rm -rf stage
 	mkdir stage
-	for PKG in $(BASE_PACKAGES);  \
-	do                            \
-	  cd $$PKG && make dist;cd ..;\
+	for PKG in $(BASE_PACKAGES);     \
+	do                               \
+	  make -C $$PKG dist || exit $?; \
 	done
-	cd perl-kolab && make -f Makefile.cvs dist
-	for PKG in $(KOLAB_PACKAGES); \
-	do                            \
-	  cd $$PKG && make dist;cd ..;\
+	make -C perl-kolab -f Makefile.cvs dist
+	for PKG in $(KOLAB_PACKAGES);    \
+	do                               \
+	  make -C $$PKG dist || exit $?; \
 	done
 	cp $(BASE_FILES) stage/
 	echo 'Remember to update obmtool.conf!'
@@ -57,12 +57,12 @@
                horde/horde-turba
 
 .PHONY: dist-horde
-dist-horde: 
+dist-horde:
 	rm -rf stage
 	mkdir -p stage
 	for PKG in $(HORDE_PACKAGES);             \
 	do                                        \
-	  cd $$PKG && make dist;cd ../..;         \
+	  make -C $$PKG dist || exit $?;          \
 	  echo -e "\n==" >> stage/ChangeLog;      \
 	  echo "$$PKG" >> stage/ChangeLog;        \
 	  echo -e "==\n" >> stage/ChangeLog;      \
@@ -72,5 +72,5 @@
 	cp obmtool-webclient.conf stage/obmtool.conf
 
 .PHONY: clean
-clean: 
-	rm -rf stage
\ No newline at end of file
+clean:
+	rm -rf stage





More information about the commits mailing list