[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.48,1.49

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

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/Makefile,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile	13 Feb 2006 22:25:33 -0000	1.48
+++ Makefile	15 Feb 2006 22:53:56 -0000	1.49
@@ -254,11 +254,15 @@
 ZIP_FLAGS=-r -T -n .gif
 endif
 
+ifeq ($(ARCH), Linux)
+MAKEARCH=$(ARCH)
+else
 ifeq ($(USE_64), 1)
 MAKEARCH=$(ARCH)64
 else
 MAKEARCH=$(ARCH)
 endif
+endif
 
 PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS))
 
@@ -598,7 +602,7 @@
 endif
 
 # copy in our product .inf files
-	$(INSTALL) -m 755 $(OBJDIR_32)/*.inf $(INSTDIR)/slapd
+	$(INSTALL) -m 755 $(OBJDIR)/*.inf $(INSTDIR)/slapd
 
 # strip the executables in the optimized build
 ifeq ($(DEBUG), optimize)
@@ -668,10 +672,10 @@
 # do one last check for aix. aix zip doesn't like -r -T 
 	$(ZIP) -T  $(INSTDIR)/slapd/ns$(DIR).zip
 # install the ns-config file into the slapd package directory
-	$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd
+	$(INSTALL) -m 755 $(RELDIR)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd
 
 # if we are packaging our own version of the components, we need them during setup too
-	- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
+	- at for file in $(PACKAGE_SETUP_LIBS) ; \
 	do if [ -f $$file ] ; \
 	then $(INSTALL) -m 755 $$file $(INSTDIR)/slapd ; \
 	fi ; \