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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sun Feb 26 00:03:13 CET 2012


Revision: 17207
          http://gar.svn.sourceforge.net/gar/?rev=17207&view=rev
Author:   bdwalton
Date:     2012-02-25 23:03:12 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
ruby19/trunk: move a few installation fixups to post-merge instead of post-install

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

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2012-02-25 15:21:52 UTC (rev 17206)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2012-02-25 23:03:12 UTC (rev 17207)
@@ -145,11 +145,15 @@
 
 COMPILE_ELISP = 1
 
-PI_TARGETS  = samples rbconfig pathfixes
+PI_TARGETS = samples rbconfig
+PM_TARGETS = pathfixes
 
 post-install-modulated: $(PI_TARGETS)
 	@$(MAKECOOKIE)
 
+post-merge: $(PM_TARGETS)
+	@$(MAKECOOKIE)
+
 multiconfig: RBCONFIG=/opt/csw/lib/ruby/$(API_VERSION)/$(GARCH)-solaris2.10/rbconfig.rb
 multiconfig:
 	@echo "Setting up the CSW rbconfig stuff so we can switch between compilers"
@@ -180,8 +184,8 @@
 # Some scripts come with /usr/local/bin/ruby hard coded.
 pathfixes:
 	@echo " ==> Fixing shebang path in distributed ruby scripts"
-	@find $(DESTDIR)$(prefix) -type f -name '*.rb' -exec \
+	@find $(PKGROOT)$(prefix) -type f -name '*.rb' -exec \
 		perl -i -plne "s{^#!/usr/local/bin/ruby}{#!$(bindir)/$(NAME)}g" {} \;
 	@echo " ==> Fixing paths in manpages"
-	@( cd $(DESTDIR)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 )
+	@( cd $(PKGROOT)$(mandir)/man1; perl -pi -e 's!usr/local/bin/ruby!opt/csw/bin/ruby191!g' ruby191.1 )
 	@$(MAKECOOKIE)

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



More information about the devel mailing list