[Fedora-directory-commits] ldapserver/ldap Makefile,1.9,1.9.2.1

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
      Tag: Directory71RtmBranch
	Makefile 
Log Message:
[168402] patch info file for 64-bit system gets broken
ldap/cm/Makefile uses the full OBJDIR name including "_64" for the patch inf location.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- Makefile	9 May 2005 22:11:21 -0000	1.9
+++ Makefile	16 Sep 2005 00:35:30 -0000	1.9.2.1
@@ -62,7 +62,9 @@
 	cd systools; $(MAKE) $(MFLAGS) all
 	# new unix installer
 ifeq ($(USE_SETUPSDK), 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