thomas: server Makefile,1.19,1.20

cvs at kolab.org cvs at kolab.org
Tue Jul 17 18:40:04 CEST 2007


Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Ported Makefile from 2.1 branch to HEAD


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	11 Jul 2007 14:38:06 -0000	1.19
+++ Makefile	17 Jul 2007 16:40:02 -0000	1.20
@@ -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 ..;\
+	for PKG in $(KOLAB_PACKAGES);              \
+	do                                         \
+	  cd $$PKG && make dist || exit $?; cd ..; \
 	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