[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.4,1.5

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Sat Apr 8 19:27:00 UTC 2006


Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9565/dsbuild/ds/ldapserver

Modified Files:
	Makefile 
Log Message:
You can now do a dsbuild with sources from CVS by using make USE_CVS=1 ...
Right now this only works with the cvs.fedora.redhat.com repository, but
it will be easy to add support for others such as mozilla.
I added ICU to the mod_admserv build.
adminserver uses MOD_*_LIBPATH instead of MOD_*_LIB_DIR now.
ldapserver uses the correct path to directoryconsole now.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	16 Feb 2006 21:33:58 -0000	1.4
+++ Makefile	8 Apr 2006 19:26:57 -0000	1.5
@@ -6,11 +6,16 @@
 # have the regular download rule download the patch rather than listing it in PATCHFILES
 # this is so we can override the default patch rule
 #MYPATCH = ldapserver-gcc4.patch
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH)
 PATCHFILES = 
 
 PKGDIR = $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work/pkg
 
+ifdef USE_CVS
+CVSMODULES = ldapserver
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
 LIBDEPS = 
 
 DESCRIPTION = ldapserver
@@ -48,6 +53,10 @@
 BUILD_ARGS += BUILD_DEBUG=optimize
 endif
 
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
 # this is our "custom" patch target
 post-patch:
 ifdef MYPATCH
@@ -76,6 +85,6 @@
 	@echo "http://directory.fedora.redhat.com/wiki/Install_Guide"
 	$(MAKECOOKIE)
 
-include ../../gar.conf.mk
+#include ../../gar.conf.mk
 
 include ../category.mk




More information about the Fedora-directory-commits mailing list