[csw-devel] SF.net SVN: gar:[13491] csw/mgar/pkg/apache2/branches/open-bug-squash

[bdwalton at users.sourceforge.net]

Revision: 13491
          http://gar.svn.sourceforge.net/gar/?rev=13491&view=rev
Author:   bdwalton
Date:     2011-02-27 21:52:45 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: move a permanent override into the main Makefile

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
    csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-02-27 21:18:44 UTC (rev 13490)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-02-27 21:52:45 UTC (rev 13491)
@@ -100,6 +100,8 @@
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 
+CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h
+
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
 

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak	2011-02-27 21:18:44 UTC (rev 13490)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/checkpkg.mak	2011-02-27 21:52:45 UTC (rev 13491)
@@ -364,8 +364,6 @@
 CHECKPKG_OVERRIDES_CSWapache2-devel += file-collision|/opt/csw/apache2/share/error/include/top.html|CSWapache2-devel|CSWapache2c
 CHECKPKG_OVERRIDES_CSWapache2 += file-collision|/opt/csw/apache2/etc/extra/httpd-info.conf.CSW|CSWapache2|CSWapache2c
 
-CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h
-
 CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.en
 CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.ja.utf8
 CHECKPKG_OVERRIDES_CSWapache2-manual += file-with-bad-content|/export/home|root/opt/csw/apache2/share/manual/logs.html.tr.utf8


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