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

[bdwalton at users.sourceforge.net]

Revision: 13611
          http://gar.svn.sourceforge.net/gar/?rev=13611&view=rev
Author:   bdwalton
Date:     2011-03-06 21:55:34 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
ruby18/trunk: add the compiler selection based on modulation, add the custom merge target

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

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-06 21:41:59 UTC (rev 13610)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-06 21:55:34 UTC (rev 13611)
@@ -127,14 +127,13 @@
 
 COMPILE_ELISP = 1
 
-ifdef USEGCC
-GARCOMPILER = GNU
-RUNTIME_DEP_PKGS_CSWruby += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWrubydev += CSWgcc4core
+ifeq ($(COMPILER),gcc4)
 # This is for rbconfig.rb: without this, modules built may not get a proper
 # setting.
+GARCOMPILER = GNU
 EXTRA_LDFLAGS = -R $(abspath /opt/csw/gcc4/lib/$(MM_LIBDIR))
 else
+GARCOMPILER = SUN
 SOS12_LD_FLAGS =
 endif
 
@@ -172,6 +171,9 @@
 
 RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb
 
+merge-copy-custom: $(PKGROOT) $(INSTALLISADIR)
+	$(_DBUG_MERGE)(cp $(INSTALLIDADIR)$(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.