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

[dmichelsen at users.sourceforge.net]

Revision: 11487
          http://gar.svn.sourceforge.net/gar/?rev=11487&view=rev
Author:   dmichelsen
Date:     2010-11-03 11:13:17 +0000 (Wed, 03 Nov 2010)

Log Message:
-----------
proftpd: Use custom-merging to allow installation to isa-specific libdir

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

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2010-11-03 08:55:24 UTC (rev 11486)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2010-11-03 11:13:17 UTC (rev 11487)
@@ -36,6 +36,11 @@
 PR_LIBEXEC_$(ISA)    ?= $(prefix)/lib/$(ISA)/proftpd
 PR_LIBEXEC            = $(PR_LIBEXEC_$(ISA))
 
+EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/lib/pentium_pro $(prefix)/lib/pentium_pro/.* $(prefix)/lib/pkgconfig.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9     = $(prefix)/lib/sparcv9 $(prefix)/lib/sparcv9/.*
+EXTRA_MERGE_SCRIPTS_isa-pentium_pro = copy-proftpd-lib
+EXTRA_MERGE_SCRIPTS_isa-sparcv9     = copy-proftpd-lib
+
 sysconfdir      = /etc/opt/csw
 localstatedir   = /var/opt/csw
 
@@ -87,3 +92,11 @@
 	rm -f $(DESTDIR)$(libexecdir_install)/*.la
 	rm -f $(DESTDIR)$(libexecdir_install)/$(ISA)/*.la
 	$(MAKECOOKIE)
+
+merge-copy-proftpd-lib:
+	$(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v \
+		$(foreach DIR,$(PR_LIBEXEC_$(ISA)),-s ",^\.\($(DIR)/\),\1,p") -s ",.*,," \
+		. $(PKGROOT) \
+		)
+	@$(MAKECOOKIE)
+


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