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

[bdwalton at users.sourceforge.net]

Revision: 11782
          http://gar.svn.sourceforge.net/gar/?rev=11782&view=rev
Author:   bdwalton
Date:     2010-12-05 02:40:24 +0000 (Sun, 05 Dec 2010)

Log Message:
-----------
apache2: no use for running buildconf any more and it breaks on the new libtool anyway; put some of the ssl cert stuff back in to handle migration for existing installs

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-12-04 18:25:12 UTC (rev 11781)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-12-05 02:40:24 UTC (rev 11782)
@@ -198,7 +198,7 @@
 PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
 
-PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/opt\/csw\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}'
+PROTOTYPE_FILTER = gawk '$$$$3 ~ /etc\/opt\/csw\/apache2/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /ssl_cert_migration.CSW/ {$$$$1 = "e"; $$$$2 = "build"}; {print}'
 
 include gar/category.mk
 
@@ -208,12 +208,10 @@
 FIXCONFIG_RMPATHS  = $(DESTDIR)
 
 pre-configure-modulated:
-	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
 	@gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \
 		$(WORKDIR)/config.layout > $(WORKDIR)/$(GARNAME)-$(GARVERSION)/config.layout
 	@$(MAKECOOKIE)
 
-
 post-install-modulated: rename-httpd copy-local-files copy-readmes
 
 copy-readmes:
@@ -248,5 +246,6 @@
 			echo "...$$f"; \
 			mv $$f $$f.CSW; \
 			$(abspath $(FILEDIR))/build_cas_template $$f > $$f; \
+			$(abspath $(FILEDIR))/ssl_cas_template server.crt > ssl_cert_migration.CSW; \
 		done )
 	@$(MAKECOOKIE)


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