diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-09-11 02:28:11 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-09-11 02:28:11 +0000 |
| commit | bf928707b5f4b2a78822b911696af8ed238ea033 (patch) | |
| tree | ab3be0504c30bbc345b360a463e1af18f2f6deb3 /ldap/admin/src/Makefile | |
| parent | 70d237c0cbd6b80b35d0da3119b54441cbcdc32b (diff) | |
| download | ds-bf928707b5f4b2a78822b911696af8ed238ea033.tar.gz ds-bf928707b5f4b2a78822b911696af8ed238ea033.tar.xz ds-bf928707b5f4b2a78822b911696af8ed238ea033.zip | |
Bug: 205456
Description: Enable core DS build
Fix Description:
1) Need to package lib/ldaputil/certmap.conf into shared/config/certmap.conf
in DS build if not using admin server
2) We create shell script wrappers for the sectools (certutil, etc.). This
was being done in the setuputil related code in ldap/cm/newinst. This has
been moved to the more generic ldap/admin/src directory where other similar
scripts live.
Tested on: RHEL4 64
Diffstat (limited to 'ldap/admin/src/Makefile')
| -rw-r--r-- | ldap/admin/src/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
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 $@ + |