[Fedora-directory-commits] ldapserver/ldap Makefile,1.10,1.11

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	Makefile 
Log Message:
[167982] Service Pack framework
Ported the patch making code to the trunk.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	2 Sep 2005 20:40:47 -0000	1.10
+++ Makefile	22 Sep 2005 16:48:11 -0000	1.11
@@ -62,7 +62,9 @@
 	cd systools; $(MAKE) $(MFLAGS) all
 	# new unix installer
 ifeq ($(USE_SETUPUTIL), 1)
-	cd cm/newinst; $(MAKE) $(MFLAGS) all
+	# passing $(OBJDIR) as ORIGINAL_OBJDIR since USE_64 info is cleaned up
+	# and lost in cm/newinst
+	cd cm/newinst; $(MAKE) $(MFLAGS) ORIGINAL_OBJDIR=$(ABS_OBJDIR) all
 ifeq ($(USE_64),1)
 	# In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts
 	# get copied into the 32-bit output directory by the makefile above. However, we later want to package them and expect