diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2005-09-16 00:35:30 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2005-09-16 00:35:30 +0000 |
| commit | 14772c5c1f3e5a718fc36d0f9a541cc3abed4ec4 (patch) | |
| tree | a4f6f596bb86c3f1fab0d0e3ca64da7c505b8ae6 | |
| parent | 4263371978e5e6843636d34167b6127d4878e72c (diff) | |
| download | ds-14772c5c1f3e5a718fc36d0f9a541cc3abed4ec4.tar.gz ds-14772c5c1f3e5a718fc36d0f9a541cc3abed4ec4.tar.xz ds-14772c5c1f3e5a718fc36d0f9a541cc3abed4ec4.zip | |
[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.
| -rw-r--r-- | ldap/Makefile | 4 | ||||
| -rw-r--r-- | ldap/cm/newinst/Makefile | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ldap/Makefile b/ldap/Makefile index c9d3c780..15e900e8 100644 --- a/ldap/Makefile +++ b/ldap/Makefile @@ -62,7 +62,9 @@ ifneq ($(ARCH), WINNT) cd systools; $(MAKE) $(MFLAGS) all # new unix installer ifeq ($(USE_SETUPSDK), 1) - cd cm/newinst; $(MAKE) $(MFLAGS) all + # 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 diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile index a5c0477f..894a9f59 100644 --- a/ldap/cm/newinst/Makefile +++ b/ldap/cm/newinst/Makefile @@ -96,6 +96,7 @@ else 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 @@ else $(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) $@-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 |