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

[bdwalton at users.sourceforge.net]

Revision: 13629
          http://gar.svn.sourceforge.net/gar/?rev=13629&view=rev
Author:   bdwalton
Date:     2011-03-07 00:51:21 +0000 (Mon, 07 Mar 2011)

Log Message:
-----------
ruby18/trunk: add the modulation configure args, tweak the custom merge script

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

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-06 23:50:44 UTC (rev 13628)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-07 00:51:21 UTC (rev 13629)
@@ -115,9 +115,10 @@
 CONFIGURE_ARGS += --with-openssl-dir=$(prefix)
 CONFIGURE_ARGS += --with-readline-dir=$(prefix)
 CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
-CONFIGURE_ARGS += --enable-install-doc
 CONFIGURE_ARGS += --program-suffix=18
+EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc
 
+
 INSTALL_ARGS = install
 
 DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL)
@@ -169,11 +170,14 @@
 
 SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL)
 
-RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb
+RBCDIR = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9
+RBCONFIG = $(RBCDIR)/rbconfig.rb
 
 merge-copy-custom: $(PKGROOT) $(INSTALLISADIR)
-	$(_DBUG_MERGE)(cp $(INSTALLIDADIR)$(RBCONFIG).$(COMPILER) \
-		$(PKGROOT)$(RBCONFIG).$(COMPILER)
+	$(_DBUG_MERGE)( [ -d "$(PKGROOT)$(RBCDIR)" ] || \
+			mkdir -p $(PKGROOT)$(RBCDIR); \
+			cp $(DESTDIR)$(RBCONFIG).$(COMPILER) \
+				$(PKGROOT)$(RBCONFIG).$(COMPILER) )
 
 post-install-modulated:
 	@echo "Stripping DESTDIR from rbconfig.rb"


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