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

[rthurner at users.sourceforge.net]

Revision: 12470
          http://gar.svn.sourceforge.net/gar/?rev=12470&view=rev
Author:   rthurner
Date:     2011-01-09 13:31:26 +0000 (Sun, 09 Jan 2011)

Log Message:
-----------
subversion: patching bin files is not build related but install

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2011-01-09 11:28:07 UTC (rev 12469)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2011-01-09 13:31:26 UTC (rev 12470)
@@ -267,11 +267,6 @@
 	else \
 	    perl -i -pe 's,-xarch=386,-march=i386,' $(WORKSRC)/*.gcc; \
 	fi )
-	@echo "~~~ patching contributions with csw paths ~~~"
-	gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl
-	gsed -i -e 's,/usr/bin/svnlook,/opt/csw/bin/svnlook,' $(WORKSRC)/contrib/*/*
-	gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi
-	gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh
 	@$(MAKECOOKIE)
 
 copy-apache-templates:
@@ -293,6 +288,12 @@
 	@$(MAKECOOKIE)
 
 install-extras:
+	@echo "~~~ patching contributions with csw paths ~~~"
+	gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl
+	gsed -i -e 's,/usr/bin/svnlook,/opt/csw/bin/svnlook,' $(WORKSRC)/contrib/*/*
+	gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi
+	gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh
+	@echo "~~~ install tools and contrib ~~~"
 	ginstall -d $(DESTDIR)$(docdir)/subversion/tools
 	ginstall -d $(DESTDIR)$(docdir)/subversion/contrib
 	gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/


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