[Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.8, 1.9

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile 
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m 
it should use x86 for the arch.  However, it should only do this if 
uname -m is not x86_64.  Also, for RHEL/Linux, we do not have to add the 
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.  
Other platforms continue to use the other naming convention.  The 
default naming convention for the mozilla components is 
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ.  I considered using Wan-Teh's 
instructions about source builds, but that would cause many changes to 
be made to our makefiles, so I just changed the way we calculate the 
mozilla OBJDIR name from the regular OBJDIR name.  These changes are 
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.

For ldapserver, I had to change nsarch (adminserver changed nsarch in a 
different way).  I also got rid of the 32 bit specific setup stuff.  I 
assume this was due to 32 bit NES admin server, so we can get rid of 
this for the future, because we will have all native 64 bit apps. I also 
went ahead and rolled in the gcc4 changes since they are safe for gcc3 
as well.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile	22 Sep 2005 16:48:16 -0000	1.8
+++ Makefile	15 Feb 2006 22:54:02 -0000	1.9
@@ -41,12 +41,6 @@
 
 .SUFFIXES: .cc
 
-# We do this to force a 32-bit build of this stuff, even in a 64-bit build 
-# (because we want to avoid various complexities inherenet in having a 64-bit
-# installer rubbing shoulders with other 32-bit stuff at install time).
-COMPONENT_DEPS := 1
-override USE_64=
-
 BUILD_ROOT = ../../..
 LDAP_SRC = ../..
 
@@ -96,7 +90,7 @@
 BINS=$(addprefix $(BINDEST)/, $(PROGS))
 endif
 INFO= $(OBJDIR)/$(DIR)
-PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR)
+PATCHINFO= $(ABS_OBJDIR)/$(DIR)
 
 # Source for staged installation utilities
 INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src