[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.51,1.52

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver/ldap/cm

Modified Files:
	Makefile 
Log Message:
Bug(s) fixed: 182613
Bug Description: Upgrade wipes out sectool wrappers
Reviewed by: Pete and Nathan (Thanks!)
Fix Description: It's better if we just package those wrappers instead 
of creating them on the fly.  The new file sec_tools_wrappers is a 
simple shell script that assumes it's being run out of a parent/bin 
directory which contains a program called $0-bin, and the shared libs it 
needs are in parent/lib.  This shell script is copied to 
shared/bin/certutil, shared/bin/modutil, etc.  I had to create another 
makefile packaging macro to handle the case where you want to package a 
file under a different name than the original. Also
1) Add Red Hat and Fedora DS to upgradeServer
2) adminutil property directory is now adminutil-properties instead of 
property
3) General clean up of some upgrade install things
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Makefile	23 Feb 2006 01:20:06 -0000	1.51
+++ Makefile	23 Feb 2006 19:30:35 -0000	1.52
@@ -346,6 +346,20 @@
 	fi ; \
 	done
 
+# PACKAGE_SRC_DESTFILE is defined in components.mk - these are component files and directories to install
+# with the other component files that we don't necessarily pick up from the admin server build
+# these can go in any directory - this differs from PACKAGE_SRC_DEST above in that in this case, the
+# destination is a _file_, not a directory, and src must be a filename, not a directory
+	for destfile in $(PACKAGE_SRC_DESTFILE) ; \
+	do if [ "$$src" ] ; \
+	then destdir=`dirname $$destfile` ; \
+		if [ ! -d $(RELDIR)/$$destdir ] ; then mkdir -p $(RELDIR)/$$destdir ; fi ; \
+		$(CP) $$src $(RELDIR)/$$destfile ; \
+		src= ; \
+	else src=$$destfile ; \
+	fi ; \
+	done
+
 # install the DSMLGW into the client directory
 # the following DSML files must be packaged separately:
 # web-app_2_3.dtd, activation.jar, saaj.jar - due to Sun license