diff options
| -rw-r--r-- | components.mk | 4 | ||||
| -rw-r--r-- | ldap/admin/src/Makefile | 11 | ||||
| -rw-r--r-- | ldap/admin/src/sec_tools_wrapper (renamed from ldap/cm/newinst/sec_tools_wrapper) | 0 | ||||
| -rw-r--r-- | ldap/cm/newinst/Makefile | 13 |
4 files changed, 15 insertions, 13 deletions
diff --git a/components.mk b/components.mk index 1dd3b19d..dff15652 100644 --- a/components.mk +++ b/components.mk @@ -645,6 +645,10 @@ ifeq ($(USE_64), 1) endif endif +# must package certmap.conf ourselves if not using admin server +ifneq ($(USE_ADMINSERVER), 1) + PACKAGE_SRC_DEST += $(BUILD_ROOT)/lib/ldaputil/certmap.conf shared/config +endif # must define dependencies last because they depend on the definitions above ifeq ($(INTERNAL_BUILD), 1) diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile index e7d43c48..8e3de153 100644 --- a/ldap/admin/src/Makefile +++ b/ldap/admin/src/Makefile @@ -241,6 +241,9 @@ INST_INCLUDES = $(OBJDIR)/install_keywords.h TEMPLATE_SCRIPTS_SRC = $(wildcard scripts/template-*) TEMPLATE_SCRIPTS_DEST = $(subst scripts/,$(SCRIPTSDIR)/,$(TEMPLATE_SCRIPTS_SRC)) +# we wrap the security tools with a shell script wrapper for their ld libpath +PACKAGE_SEC_TOOLS = $(addprefix $(RELDIR)/shared/bin/,$(SECURITY_TOOLS)) + # 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 @@ -266,7 +269,7 @@ endif all: $(BINDIR) $(OBJDEST) $(INST_INCLUDES) $(ALLOBJS) $(BINS) \ installPerlFiles $(SCRIPTSDIR) $(TEMPLATE_SCRIPTS_DEST) \ - $(FIX_SECMOD_DEP) + $(FIX_SECMOD_DEP) $(PACKAGE_SEC_TOOLS) $(SCRIPTSDIR): $(MKDIR) $@ @@ -381,3 +384,9 @@ $(SCRIPTSDIR)/template-%: scripts/template-% $(SCRIPTSDIR) -@$(RM) $@ $(CP) $< $@ chmod +x $@ + +$(RELDIR)/shared/bin/%: sec_tools_wrapper $(RELDIR)/shared/bin + -@$(RM) $@ + $(CP) $< $@ + chmod +x $@ + diff --git a/ldap/cm/newinst/sec_tools_wrapper b/ldap/admin/src/sec_tools_wrapper index 338a1569..338a1569 100644 --- a/ldap/cm/newinst/sec_tools_wrapper +++ b/ldap/admin/src/sec_tools_wrapper diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile index 321cc3c8..5e4bffd6 100644 --- a/ldap/cm/newinst/Makefile +++ b/ldap/cm/newinst/Makefile @@ -95,13 +95,7 @@ PATCHINFO= $(ABS_OBJDIR)/$(DIR) # Source for staged installation utilities INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src -# we wrap the security tools with a shell script wrapper for their ld libpath -PACKAGE_SEC_T0OLS = $(addprefix $(RELDIR)/shared/bin/,$(SECURITY_TOOLS)) - -# ADM_VERSDIR = admserv40 -# ADM_RELDATE = 19980112 - -all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall $(PACKAGE_SEC_T0OLS) +all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall # removed ns-keygen from build - it was only used for Dir Lite # $(BINDEST)/ns-keygen ifeq ($(ARCH), BSDI) @@ -173,11 +167,6 @@ $(BINDEST)/ns-config: $(OBJS1) $(OBJS2) -o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \ $(SASL_LINK) $(EXTRA_LIBS) $(CURSES) -$(RELDIR)/shared/bin/%: sec_tools_wrapper $(RELDIR)/shared/bin - -@$(RM) $@ - $(CP) $< $@ - chmod +x $@ - ifeq ($(ARCH), WINNT) $(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) "bin/admin/ns-admin,bin/admin/ns-admin.so" |