[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.31,1.32
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Wed Sep 14 21:39:50 UTC 2005
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28974/ldap/cm
Modified Files:
Makefile
Log Message:
168309 - Removed setup wrappers used for Java packaging and added RPM dependency for java-1.4.2-ibm package.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile 2 Sep 2005 20:40:53 -0000 1.31
+++ Makefile 14 Sep 2005 21:39:42 -0000 1.32
@@ -696,25 +696,6 @@
# base.inf file
$(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
-# Move setup binary to dssetup
- mv $(INSTDIR)/setup $(INSTDIR)/dssetup
-# Move the new setup wrappers into place
- cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR)/setup.pl
- cp $(BUILD_ROOT)/ldap/cm/newinst/setup.sh $(INSTDIR)/setup
-
-# We need to package perl for the new setup wrapper to run
- mkdir $(INSTDIR)/tmp
- $(UNZIP) $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/\* -d $(INSTDIR)/tmp
- cp -R $(INSTDIR)/tmp/lib/nsPerl5.6.1 \
- $(INSTDIR)/tools
- rm -rf $(INSTDIR)/tmp
-
-# We also need to package the infozip utilities
- $(UNZIP) -j $(INSTDIR)/tools/infozip.zip \
- -d $(INSTDIR)/tools
- rm -f $(INSTDIR)/tools/infozip.zip
-
# Install LDAP Readme and License files at root of Installation (dated pre-packaging) directory.
# And, replace the License.txt file that is packaged in nssvrcore.zip.
if [ -d $(LDAPDIR)/docs ] ; then \
@@ -731,13 +712,13 @@
| gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz
# build the combined packages tar file; use h flag to follow symlinks
ifdef BUILD_SHIP
- cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \
+ cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
- cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \
+ cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
@@ -892,11 +873,6 @@
mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR)
# make sure our packages are in the setup.inf file
$(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf
-# move setup.exe to dssetup.exe
- mv $(INSTDIR)/setup.exe $(INSTDIR)/dssetup.exe
-# copy in the new setup wrapper script
- cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR)
- cp $(BUILD_ROOT)/ldap/cm/newinstnt/setup.bat $(INSTDIR)
#---------------------------- slapd rules --------------------------------------------------
More information about the Fedora-directory-commits
mailing list