[Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.14, 1.15
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Feb 17 17:02:27 UTC 2006
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7860
Modified Files:
Makefile
Log Message:
Don't attempt to package 32 bit NSS apps/libs with the 64 bit package on rhel/linux - assume everything is native 64 bit.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 21 Oct 2005 19:21:10 -0000 1.14
+++ Makefile 17 Feb 2006 17:02:05 -0000 1.15
@@ -235,8 +235,20 @@
TEMPLATE_SCRIPTS_SRC = $(wildcard scripts/template-*)
TEMPLATE_SCRIPTS_DEST = $(subst scripts/,$(SCRIPTSDIR)/,$(TEMPLATE_SCRIPTS_SRC))
+# We only need to do this if we have to ship 32 bit binaries in our 64 bit packages
+# Right now, on rhel/linux, we ship all native 64 bit apps so we don't have to do
+# this. We still may need to do this on solaris/hpux, but hopefully not for very
+# much longer
ifeq ($(USE_64), 1)
- FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64
+ ifeq ($(ARCH), RHEL)
+ FIX_SECMOD_DEP =
+ else
+ ifeq ($(ARCH), Linux)
+ FIX_SECMOD_DEP =
+ else
+ FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64
+ endif
+ endif
endif
# gmake 3.74 will remove "intermediate" files if generated via a pattern match rule
More information about the Fedora-directory-commits
mailing list