Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7763/adminserver/admserv Modified Files: pkgadmin.mk Log Message: Change packaging so that either the old style adminutil properties or the new style can be used. Package the patch files in the setup directory. Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- pkgadmin.mk 23 Nov 2005 01:25:51 -0000 1.32 +++ pkgadmin.mk 7 Dec 2005 22:45:16 -0000 1.33 @@ -254,8 +254,13 @@ # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib - -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties - cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties + -@if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \ + -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \ + cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \ + elif [ -d $(ADMINUTIL_LIBPATH)/adminutil-properties ] ; then \ + -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ + cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \ + fi cd $(ADMSERV_OBJDIR)/cmdln; \ cp -p admconfig $(ADMIN_DIR)/bin/admin; @@ -274,6 +279,13 @@ cp -p $(BUILD_ROOT)/admserv/cfgstuff/stop-admin $(ADMIN_DIR)/shared/config/template/stop-admin.tmpl cp -p $(BUILD_ROOT)/admserv/cfgstuff/restart-admin $(ADMIN_DIR)/shared/config/template/restart-admin.tmpl +# The patch file that upgrades 1.0 to 1.0.1 + cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver10to101.patch $(ADMIN_DIR)/setup +# The patch file that fixes the start-admin ldap problem on Fedora Core 2 + cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-start-admin.patch $(ADMIN_DIR)/setup +# The patch file that fixes the console ld libpath problem + cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup + cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients cd $(ADMSERV_OBJDIR)/cgi ; \