gunnar: server/make-helper pear.mk,1.5,1.6 
    cvs at kolab.org 
    cvs at kolab.org
       
    Fri Jan 22 16:36:05 CET 2010
    
        - Previous message: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6	t_imp_H_GW_FoldersView.diff, NONE, 1.1 series, 1.3, 1.4 
 
        - Next message: gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec, 1.26,	1.27 .cvsignore, 1.5, 1.6 Makefile, 1.12, 1.13 package.info, 1.1, 1.2 
 
         -  Messages sorted by: 
              [ date ]
              [ thread ]
              [ subject ]
              [ author ]
         
 
       
    
  
Author: gunnar
Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv10044/make-helper
Modified Files:
	pear.mk 
Log Message:
Fix packages with a special spec file. Works for now but the duplication of information in package.info and the spec file should be removed at a later timepoint.
Index: pear.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/pear.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pear.mk	18 Jan 2010 23:01:46 -0000	1.5
+++ pear.mk	22 Jan 2010 15:36:03 -0000	1.6
@@ -209,6 +209,10 @@
 	  cat $$PATCH >> package.patch; \
 	done
 
+# TODO: Fix SPEC_PRESENT so that we may include a custom install
+# section for PEAR packages that are more than just a library.
+ifneq ($(SPEC_PRESENT),)
+else
 $(PACKAGE).spec: ../../pear/pear.spec.template package.info
 	source ./package.info &&                               \
 	  cat ../../pear/pear.spec.template |                  \
@@ -231,4 +235,4 @@
 	      -e "s#[@]description[@]#$${description}#g"       \
 	      -e "s#[@]with_chroot[@]#$(WITH_CHROOT)#g" >      \
 	  $(PACKAGE).spec
-
+endif
    
    
        
	- Previous message: gunnar: server/kolab-webclient/imp/patches/imp-4.3.6	t_imp_H_GW_FoldersView.diff, NONE, 1.1 series, 1.3, 1.4 
 
	- Next message: gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec, 1.26,	1.27 .cvsignore, 1.5, 1.6 Makefile, 1.12, 1.13 package.info, 1.1, 1.2 
 
         -  Messages sorted by: 
              [ date ]
              [ thread ]
              [ subject ]
              [ author ]
         
 
       
More information about the commits
mailing list