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

[bdwalton at users.sourceforge.net]

Revision: 17091
          http://gar.svn.sourceforge.net/gar/?rev=17091&view=rev
Author:   bdwalton
Date:     2012-02-20 13:54:38 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
ruby19/trunk: accomodate better handling of the ruby api versioning in our recipe

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2012-02-20 13:06:39 UTC (rev 17090)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2012-02-20 13:54:38 UTC (rev 17091)
@@ -6,6 +6,7 @@
 
 #NOTE: Some things below use version 1.9.1.  As of 1.9.3, the api of
 #the libs is 1.9.1, so that is why we can't use $(VERSION).
+RUBY_API = 1.9.1
 
 # patchfile 0002-vm.c... is a backport from upstream
 VERSION_FLAG_PATCH = 1
@@ -38,7 +39,7 @@
 endef
 
 PACKAGES  =  CSWruby19 CSWruby19-samples CSWruby19-ri CSWruby19-tk
-PACKAGES += CSWruby19-dev CSWlibruby19-1
+PACKAGES += CSWruby19-dev CSWlibruby191-1
 
 ARCHALL_CSWruby19-samples = 1
 ARCHALL_CSWruby19-ri = 1
@@ -99,9 +100,9 @@
 # UPSTREAM_MASTER_SITES = 
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --program-suffix=19
+CONFIGURE_ARGS += --program-suffix=$(RUBY_API)
 CONFIGURE_ARGS += --enable-shared
-CONFIGURE_ARGS += --with-soname=ruby19
+CONFIGURE_ARGS += --with-soname=ruby$(RUBY_API)
 
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
@@ -138,7 +139,7 @@
 post-install-modulated: $(PI_TARGETS)
 	@$(MAKECOOKIE)
 
-multiconfig: RBCONFIG=/opt/csw/lib/ruby/1.9.1/$(GARCH)-solaris2.10/rbconfig.rb
+multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(RUBY_API)/$(GARCH)-solaris2.10/rbconfig.rb
 multiconfig:
 	@echo "Setting up the CSW rbconfig stuff so we can switch between compilers"
 	@mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12
@@ -153,7 +154,7 @@
 # Fix up rbconfig
 rbconfig:
 	@gsed -i -e s,$(DESTDIR),, \
-		$(DESTDIR)$(libdir)/ruby/1.9.1/$(GARCH)-solaris2.10/rbconfig.rb
+		$(DESTDIR)$(libdir)/ruby/$(RUBY_API)/$(GARCH)-solaris2.10/rbconfig.rb
 	@$(MAKECOOKIE)
 
 # Copy samples

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