[csw-devel] SF.net SVN: gar:[12040] csw/mgar/pkg/openldap/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 12040
          http://gar.svn.sourceforge.net/gar/?rev=12040&view=rev
Author:   dmichelsen
Date:     2010-12-20 12:38:48 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
openldap: Preserve configuration as reported in #4638

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2010-12-20 12:00:15 UTC (rev 12039)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2010-12-20 12:38:48 UTC (rev 12040)
@@ -151,6 +151,13 @@
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-2.3.43 = .*\.so
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9-version-2.3.43 = .*\.so
 
+# These are the config templates. As we have preserveconf which takes
+# care of this we exclude them in the package.
+EXTRA_MERGE_EXCLUDE_FILES = .*\.default
+
+PRESERVECONF  = /etc/opt/csw/openldap/ldap.conf
+PRESERVECONF += /etc/opt/csw/openldap/slapd.conf
+
 PKGFILES_CSWoldapclient  = $(bindir)/.*
 PKGFILES_CSWoldapclient += $(mandir)/man1/.*
 
@@ -162,6 +169,7 @@
 PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
 
 INITSMF = /opt/csw/etc/init.d/cswopenldap
+
 CHECKPKG_OVERRIDES_CSWoldap += init-file-wrong-location|/opt/csw/etc/init.d/cswopenldap
 
 # New libnet not released yet


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.