[Fedora-directory-commits] ldapserver/ldap Makefile, 1.11, 1.12 nsldap.mk, 1.10, 1.11

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile nsldap.mk 
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/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	22 Sep 2005 16:48:11 -0000	1.11
+++ Makefile	15 Feb 2006 22:53:51 -0000	1.12
@@ -62,16 +62,7 @@
 	cd systools; $(MAKE) $(MFLAGS) all
 	# new unix installer
 ifeq ($(USE_SETUPUTIL), 1)
-	# 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
-	# to see them in the 64-bit output directory. So, here we copy them over.
-	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR)
-	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR)
-endif # USE_64
+	cd cm/newinst; $(MAKE) $(MFLAGS)  all
 endif # USE_SETUPUTIL
 else # not WINNT
 ifeq ($(USE_SETUPUTIL), 1)


Index: nsldap.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsldap.mk	3 Oct 2005 19:53:46 -0000	1.10
+++ nsldap.mk	15 Feb 2006 22:53:51 -0000	1.11
@@ -1490,7 +1490,7 @@
 #
 
 # compiler to use, e.g. CC=cc or CC=gcc
-CC=/usr/bin/gcc -fwritable-strings
+CC=/usr/bin/gcc
 
 # give full path to hostname since it may not be in user's path
 HOSTNAME=/bin/hostname