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

[dmichelsen at users.sourceforge.net]

Revision: 14326
          http://gar.svn.sourceforge.net/gar/?rev=14326&view=rev
Author:   dmichelsen
Date:     2011-04-19 19:54:38 +0000 (Tue, 19 Apr 2011)

Log Message:
-----------
openldap: Fix #4759 (configuration file migration does not work) and update to new defaults

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2011-04-19 19:53:58 UTC (rev 14325)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2011-04-19 19:54:38 UTC (rev 14326)
@@ -85,7 +85,7 @@
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
-MIGRATECONF = openldap
+MIGRATE_FILES = openldap
 
 # Is this causing this?
 #   https://www.opencsw.org/mantis/view.php?id=4555
@@ -96,7 +96,6 @@
 NODIRPATHS = --docdir
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-crypt
 CONFIGURE_ARGS += --enable-lmpasswd
@@ -130,7 +129,6 @@
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
 SKIPTEST ?= 1
-TEST_TARGET = check
 
 MERGE_SCRIPTS_isa-default-version-2.3.43 = copy-only
 MERGE_DIRS_isa-default-version-2.3.43 = $(libdir)
@@ -142,8 +140,8 @@
 MERGE_DIRS_isa-default64-version-2.4.23 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
 # Perl backend is built, although it has been told not to.
-EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,,
-EXTRA_PAX_ARGS = -s,.*/opt/csw/libexec/amd64/openldap/back_perl.*,,
+EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/sparcv9/openldap/back_perl.*,,
+EXTRA_PAX_ARGS = -s ,.*/opt/csw/libexec/amd64/openldap/back_perl.*,,
 
 # Make sure we do not use the 2.3 .so-links in any case
 EXTRA_MERGE_EXCLUDE_FILES_isa-i386-version-2.3.43 = .*\.so


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