[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.29, 1.30

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8736/adminserver/admserv

Modified Files:
	pkgadmin.mk 
Log Message:
allow developers to build an adminserver with the 3 Apache modules included for convenience but not packaging


Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pkgadmin.mk	3 Nov 2005 23:20:44 -0000	1.29
+++ pkgadmin.mk	14 Nov 2005 03:57:32 -0000	1.30
@@ -121,6 +121,21 @@
 IZIP  = $(ZIP) -ry9uT -n .gif
 endif
 
+ifdef PKG_APACHE_MODULES
+ifndef MOD_ADMSERV_LIB_DIR
+	MOD_ADMSERV_LIB_DIR=$(BUILD_ROOT)/../mod_admserv/.libs
+endif
+ifndef MOD_RESTARTD_LIB_DIR
+	MOD_RESTARTD_LIB_DIR=$(BUILD_ROOT)/../mod_restartd/.libs
+endif
+ifndef MOD_NSS_LIB_DIR
+	MOD_NSS_LIB_DIR=$(BUILD_ROOT)/../mod_nss/.libs
+endif
+ifndef MOD_NSS_BIN_DIR
+	MOD_NSS_BIN_DIR=$(BUILD_ROOT)/../mod_nss
+endif
+endif
+
 ifneq ($(strip $(ADM_VERSION)),)
 all:
 	-if [ ! -d $(PKGTOP) ]; then \
@@ -295,6 +310,14 @@
 # Copy shared configuration
 	cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config
 
+# The Apache modules, if present
+ifdef PKG_APACHE_MODULES
+	cp $(MOD_ADMSERV_LIB_DIR)/libmodadmserv.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+	cp $(MOD_RESTARTD_LIB_DIR)/libmodrestartd.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+	cp $(MOD_NSS_LIB_DIR)/libmodnss.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+	cp $(MOD_NSS_BIN_DIR)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
+endif
+
 #
 # Cleanup before making distributable tar
 #