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

[wahwah at users.sourceforge.net]

Revision: 13439
          http://gar.svn.sourceforge.net/gar/?rev=13439&view=rev
Author:   wahwah
Date:     2011-02-22 08:32:38 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
puppet: Fixed a problem with a file in /etc/puppet

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

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2011-02-22 00:47:04 UTC (rev 13438)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2011-02-22 08:32:38 UTC (rev 13439)
@@ -96,14 +96,18 @@
 	gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
 	gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
 	gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb)
-	cd $(WORKSRC) && DESTDIR=$(DESTDIR) ruby install.rb
+	cd $(WORKSRC) && $(INSTALL_ENV) ruby install.rb \
+		--configdir=$(sysconfdir) \
+		--bindir=$(bindir) \
+		--sbindir=$(sbindir) \
+		--full
 	cd $(DESTDIR)$(mandir)/man8 && gunzip *
 	(cd $(WORKSRC)/examples/etc/puppet && \
 	for f in *; do \
 	    if [ -f $$f ] ; then \
 	        cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
 	        chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
-	    fi \
+	    fi; \
 	done)
 	ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet
 	ginstall -m 644 $(FILEDIR)/cswusergroup \


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