[csw-devel] SF.net SVN: gar:[19428] csw/mgar/pkg/apache2/branches/apache24/Makefile

[bdwalton at users.sourceforge.net]

Revision: 19428
          http://gar.svn.sourceforge.net/gar/?rev=19428&view=rev
Author:   bdwalton
Date:     2012-10-12 08:15:37 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
apache2/branches/apache24: the envvars moving needs to happen post install so the files can be preserveconf-ed

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-12 08:05:15 UTC (rev 19427)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-12 08:15:37 UTC (rev 19428)
@@ -101,6 +101,13 @@
 
 CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS)
 
+post-install-modulated:
+	@(cd $(DESTDIR)/$(sbindir); \
+	   for f in envvars*; do \
+		mv $$f $(DESTDIR)/$(sysconfdir)/apache24/; \
+		ln -s $(sysconfdir)/apache24/$$f $$f; \
+	   done )
+
 post-merge:
 	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
 		rm -rf original; \
@@ -110,11 +117,6 @@
 		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* )
 	@( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \
 	    ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d )
-	@(cd $(PKGROOT)/$(sbindir); \
-	   for f in envvars*; do \
-		mv $$f $(PKGROOT)/$(sysconfdir)/apache24/; \
-		ln -s $(sysconfdir)/apache24/$$f $$f; \
-	   done )
 
 	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
 		echo "# create server.(crt|csr)/server.key" > server )

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