[Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.3,1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

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/adminserver/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	16 Feb 2006 21:33:47 -0000	1.3
+++ Makefile	8 Apr 2006 19:26:50 -0000	1.4
@@ -3,9 +3,14 @@
 GARNAME = fedora-adminserver
 GARVERSION = 1.0.2
 CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = 
 
+ifdef USE_CVS
+CVSMODULES=adminserver
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
 LIBDEPS = 
 
 DESCRIPTION = adminserver
@@ -21,10 +26,10 @@
 	ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
 	SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
 	ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.2 \
-	MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \
-	MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \
-	MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \
-	MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2
+	MOD_ADMSERV_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \
+	MOD_RESTARTD_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \
+	MOD_NSS_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \
+	MOD_NSS_BINPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2
 
 ifndef NOJAVA
 BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work
@@ -34,6 +39,10 @@
 BUILD_ARGS += BUILD_DEBUG=optimize
 endif
 
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
 configure-custom:
 	$(MAKECOOKIE)