Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/admserv
Modified Files:
pkgadmin.mk
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pkgadmin.mk 1 Mar 2006 15:19:00 -0000 1.42
+++ pkgadmin.mk 21 Mar 2006 18:33:43 -0000 1.43
@@ -124,20 +124,6 @@
# enable apache module packaging by default - apl is compatible with the gpl
# in this specific instance
PKG_APACHE_MODULES = 1
-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
ifndef NOJAVA
ALLTARGETS = pkguxClient
@@ -168,7 +154,7 @@
# grab the jar files
cd $(ADMIN_JARS) ; \
- cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+ cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar
$(CLIENT_DIR)/java/jars
#
# Cleanup before making distributable zip
@@ -342,10 +328,10 @@
# 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
+ cp $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_RESTARTD_LIBPATH)/libmodrestartd.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_LIBPATH)/libmodnss.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_BINPATH)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
endif
#
@@ -387,7 +373,7 @@
cp -p $(SETUPUTIL_BIN)/setup.inf $(PKGTOP)
-if [ -z "`egrep "\[admin\]" $(SETUPUTIL_BIN)/setup.inf`" ]; then \
components=`grep "^Components.*=" $(SETUPUTIL_BIN)/setup.inf`; \
- if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \
+ if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \
cat $(SETUPUTIL_BIN)/setup.inf | sed -e "s/^Components.*=.*/&,
admin/" > $(PKGTOP)/setup.inf; \
fi; \
echo "" >> $(PKGTOP)/setup.inf; \
Show replies by thread