SF.net SVN: gar:[24446] csw/mgar/pkg/puppet/trunk/Makefile

[tosmi at users.sourceforge.net]

Revision: 24446
          http://sourceforge.net/p/gar/code/24446
Author:   tosmi
Date:     2014-12-12 12:12:35 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
puppet: use ruby18, change facter dep to facter_ruby18, drop augeas support

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

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2014-12-11 21:18:58 UTC (rev 24445)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2014-12-12 12:12:35 UTC (rev 24446)
@@ -53,7 +53,6 @@
 
 RUNTIME_DEP_PKGS                  = CSWfacter-ruby18
 RUNTIME_DEP_PKGS                 += CSWruby18
-RUNTIME_DEP_PKGS				 += CSWrubyaugeas
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby18
 
@@ -67,7 +66,7 @@
 
 sysconfdir     = /etc$(prefix)
 localstatedir  = /var$(prefix)
-rubysitelibdir = $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+rubysitelibdir = $(shell ruby18 -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS     =
@@ -102,7 +101,7 @@
 	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)/etc$(prefix)/init.d
-	cd $(WORKSRC) && $(INSTALL_ENV) ruby install.rb \
+	cd $(WORKSRC) && $(INSTALL_ENV) ruby18 install.rb \
 		--configdir=$(sysconfdir)/puppet \
 		--bindir=$(bindir) \
 		--sbindir=$(sbindir) \

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