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

[bdwalton at users.sourceforge.net]

Revision: 21362
          http://gar.svn.sourceforge.net/gar/?rev=21362&view=rev
Author:   bdwalton
Date:     2013-06-17 21:28:50 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
apache2/trunk: handle the post-merge step correctly when ensuring the envvars files live in etc

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2013-06-17 20:43:55 UTC (rev 21361)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2013-06-17 21:28:50 UTC (rev 21362)
@@ -342,6 +342,6 @@
 		perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *)
 	@echo Adding link from original envvars location
 	@(cd $(PKGROOT)/$(prefix)/apache2/sbin; \
-		ln -s ../etc/envvars envvars )
+	 	[ -L envvars ] || ln -s ../etc/envvars envvars )
 	@$(MAKECOOKIE)
 

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