gunnar: server Makefile,1.18,1.19

cvs at kolab.org cvs at kolab.org
Wed Jul 11 16:38:09 CEST 2007


Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	30 May 2007 06:17:24 -0000	1.18
+++ Makefile	11 Jul 2007 14:38:06 -0000	1.19
@@ -8,13 +8,13 @@
               openldap                \
               imapd                   \
               postfix                 \
-              perl-kolab              \
-              kolabd                  \
-              kolab-horde-fbview      \
-              kolab-horde-framework   \
-              kolab-resource-handlers \
-              php-smarty              \
-              kolab-webadmin          \
+              php-smarty
+
+KOLAB_PACKAGES=kolabd                  \
+               kolab-horde-fbview      \
+               kolab-horde-framework   \
+               kolab-resource-handlers \
+               kolab-webadmin          \
 
 BASE_FILES=obmtool      \
            obmtool.conf \
@@ -28,29 +28,33 @@
 	do                            \
 	  cd $$PKG && make dist;cd ..;\
 	done
+	cd perl-kolab && make -f Makefile.cvs dist
+	for PKG in $(KOLAB_PACKAGES); \
+	do                            \
+	  cd $$PKG && make dist;cd ..;\
+	done
 	cp $(BASE_FILES) stage/
 	echo 'Remember to update obmtool.conf!'
 
-HORDE_PACKAGES=kolab-webadmin      \
-               PEAR-PEAR           \
-               PEAR-Archive_Tar    \
-               PEAR-Auth_SASL      \
-               PEAR-Console_Getopt \
-               PEAR-Date           \
-               PEAR-Log            \
-               PEAR-Mail           \
-               PEAR-Mail_Mime      \
-               PEAR-Net_Sieve      \
-               PEAR-Net_Socket     \
-               horde-framework     \
-               horde-passwd        \
-               horde               \
-               horde-ingo          \
-               horde-imp           \
-               horde-kronolith     \
-               horde-mnemo         \
-               horde-nag           \
-               horde-turba
+HORDE_PACKAGES=pear/PEAR-PEAR           \
+               pear/PEAR-Archive_Tar    \
+               pear/PEAR-Auth_SASL      \
+               pear/PEAR-Console_Getopt \
+               pear/PEAR-Date           \
+               pear/PEAR-Log            \
+               pear/PEAR-Mail           \
+               pear/PEAR-Mail_Mime      \
+               pear/PEAR-Net_Sieve      \
+               pear/PEAR-Net_Socket     \
+               horde/horde-framework    \
+               horde/horde-passwd       \
+               horde/horde              \
+               horde/horde-ingo         \
+               horde/horde-imp          \
+               horde/horde-kronolith    \
+               horde/horde-mnemo        \
+               horde/horde-nag          \
+               horde/horde-turba
 
 .PHONY: dist-horde
 dist-horde: 
@@ -58,7 +62,7 @@
 	mkdir -p stage
 	for PKG in $(HORDE_PACKAGES);             \
 	do                                        \
-	  cd $$PKG && make dist;cd ..;            \
+	  cd $$PKG && make dist;cd ../..;         \
 	  echo -e "\n==" >> stage/ChangeLog;      \
 	  echo "$$PKG" >> stage/ChangeLog;        \
 	  echo -e "==\n" >> stage/ChangeLog;      \





More information about the commits mailing list