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

[bdwalton at users.sourceforge.net]

Revision: 19376
          http://gar.svn.sourceforge.net/gar/?rev=19376&view=rev
Author:   bdwalton
Date:     2012-10-04 14:36:54 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
apache2/branches/apache24: fix up usr/local references in man pages instead of using overrides

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-04 11:29:21 UTC (rev 19375)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-04 14:36:54 UTC (rev 19376)
@@ -52,7 +52,6 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2
-CHECKPKG_OVERRIDES_CSWapache24 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/htdbm.1
 
 PACKAGES += CSWapache24-manual
 ARCHALL_CSWapache24-manual = 1
@@ -105,5 +104,8 @@
 post-merge:
 	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
 		rm -rf original; \
-		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf )
+		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf ; \
+	  cd $(PKGROOT)/$(mandir); \
+		perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache24|g' man1/*; \
+		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* )
 	@$(MAKECOOKIE)

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