Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11704/cm/newinst
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/cm/newinst/Makefile,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- Makefile 10 Sep 2005 00:41:48 -0000 1.6.2.2
+++ Makefile 16 Sep 2005 00:35:30 -0000 1.6.2.3
@@ -96,6 +96,7 @@
BINS=$(addprefix $(BINDEST)/, $(PROGS))
endif
INFO= $(OBJDIR)/$(DIR)
+PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR)
# Source for staged installation utilities
INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib
-I$(LDAP_SRC)/admin/src
@@ -182,7 +183,7 @@
$(INFO):
$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION)
$(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE)
$(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS))
bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so
bin/slapd/bin/libnsslapd_shr.a"
ifdef BUILD_PATCH
- $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION)
$(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME)
$(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(a)-patch.inf $(BUILD_BOMB) "$(addprefix
lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd
bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
+ $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION)
$(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME)
$(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(PATCHINFO)-patch.inf $(BUILD_BOMB)
"$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd
bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
endif
endif
Show replies by date