diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-04-07 01:33:38 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-04-07 01:33:38 +0000 |
| commit | 79ed063f69036e5d8ecd264fe73da80655edec4c (patch) | |
| tree | 46cc70773c46758ff7b856c04c7023cc7a83da86 /ldap/cm/Makefile | |
| parent | 52e9249e7e9a0175442350482712d215038f18a6 (diff) | |
| download | ds-79ed063f69036e5d8ecd264fe73da80655edec4c.tar.gz ds-79ed063f69036e5d8ecd264fe73da80655edec4c.tar.xz ds-79ed063f69036e5d8ecd264fe73da80655edec4c.zip | |
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
Diffstat (limited to 'ldap/cm/Makefile')
| -rw-r--r-- | ldap/cm/Makefile | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 837ff8fd..aa24b2f4 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -195,7 +195,7 @@ ADMIN_SERVER_TARGZ=$(ADMINSERVER_PKG) ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ) ifeq ($(USE_SETUPUTIL), 1) - LDAP_PACKAGE_FILES:=setup setup.inf setup.res slient.inf unzip_wrapper.pl dsktune LICENSE.txt README.txt slapd + LDAP_PACKAGE_FILES:=setup setup.inf setup.res silent.inf unzip_wrapper.pl svrcore dsktune LICENSE.txt README.txt slapd else LDAP_PACKAGE_FILES:=setup dsktune slapd endif @@ -626,12 +626,24 @@ packageDirectory: $(INSTDIR)/slapd \ # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others ifeq ($(USE_SETUPUTIL), 1) cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR) + @echo "removing unzipped dir" + @dirs=`ls $(INSTDIR)`; for adir in $$dirs ; do \ + if [ -d $(INSTDIR)/$$adir/unzipped ] ; then \ + rm -rf $(INSTDIR)/$$adir/unzipped; \ + fi; \ + done ifeq ($(DS_BRAND), redhat) - cd $(INSTDIR); \ - $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \ + @(cd $(INSTDIR); \ + $(PERL) $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \ cat setup.inf | sed -e "s/^#Resource/Resource/" > setup.inf.tmp; \ - mv setup.inf.tmp setup.inf + mv setup.inf.tmp setup.inf) +endif endif + +ifeq ($(USE_PERLDAP), 1) + mkdir $(INSTDIR)/perldap + cp -R $(PERLDAP_BUILT_DIR)/* $(INSTDIR)/perldap + $(PERL) genPerlDAPInf.pl $(INSTDIR)/perldap/perldap.inf 1.5 "Fedora Project" endif # copy in our product .inf files |