SF.net SVN: gar:[22314] csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile

[guengel at users.sourceforge.net]

Revision: 22314
          http://gar.svn.sourceforge.net/gar/?rev=22314&view=rev
Author:   guengel
Date:     2013-10-26 15:49:44 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
pg-ip4r/branches/ip4r-1.05: Set MERGE_DIRS_$(MODULATION) properly for 64bit ISA.

Modified Paths:
--------------
    csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile

Modified: csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile
===================================================================
--- csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile	2013-10-26 14:27:56 UTC (rev 22313)
+++ csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile	2013-10-26 15:49:44 UTC (rev 22314)
@@ -49,8 +49,9 @@
 CONFIGURE_ARGS_83		= --with-docdir=$(docdir)/postgresql/$(PGVERSION)
 
 MERGE_SCRIPTS_$(MODULATION)	= copy-relocate
+# Only set MERGE_DIRS_$(MODULATION) if it is a 64bit ISA
+MERGE_DIRS_$(MODULATION)	= $(if $(subst $(ISA_DEFAULT64),,$(ISA)),,$(libdir))
 
-
 PACKAGES  =  $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r)
 $(foreach v,$(MODULATIONS_PGVERSION),\
 	$(eval SPKG_DESC_CSWpg$(v)-ip4r = Indexable version of the cidr type for PostgreSQL $(PG_BASEVERSION_DOT_$(v)))\

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