[Fedora-directory-commits] dsbuild/ds/mod_admserv Makefile,1.2,1.3

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


Author: rmeggins

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

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/mod_admserv/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	14 Feb 2006 22:29:12 -0000	1.2
+++ Makefile	8 Apr 2006 19:26:58 -0000	1.3
@@ -3,9 +3,14 @@
 GARNAME = mod_admserv
 GARVERSION = 1.0.2
 CATEGORIES = ds
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = 
 
+ifdef USE_CVS
+CVSMODULES=mod_admserv
+else
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+endif
+
 LIBDEPS = 
 
 DESCRIPTION = mod_admserv
@@ -13,6 +18,7 @@
 MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist
 
 ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2/built/adminutil/$(OBJDIR_NAME)
+ICU = $(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4/built
 
 INSTALL_SCRIPTS = custom
 
@@ -27,6 +33,10 @@
 INSTALL_SCRIPTS = custom
 BUILD_ARGS = 
 
+ifdef USE_CVS
+post-extract: extract-cvs
+endif
+
 ifdef BUILD_MODULE_RPM
   ifeq ($(DEBUG),full)
     FLAVOR=dbg
@@ -45,7 +55,7 @@
 
 else # BUILD_MODULE_RPM
 
-CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib --with-ldapsdk-inc=$(MOZILLA_DIST)/public/ldap --with-ldapsdk-lib=$(MOZILLA_DIST)/lib --with-adminutil=$(ADMINUTIL)
+CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib --with-ldapsdk-inc=$(MOZILLA_DIST)/public/ldap --with-ldapsdk-lib=$(MOZILLA_DIST)/lib --with-adminutil=$(ADMINUTIL) --with-icu=$(ICU)
 
 ifeq ($(DEBUG),full)
 CONFIGURE_ENV = CFLAGS=-g




More information about the Fedora-directory-commits mailing list