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

[aigoshin at users.sourceforge.net]

Revision: 7601
          http://gar.svn.sourceforge.net/gar/?rev=7601&view=rev
Author:   aigoshin
Date:     2009-12-12 12:29:29 +0000 (Sat, 12 Dec 2009)

Log Message:
-----------
nginx: milestone 4.1

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2009-12-12 10:49:43 UTC (rev 7600)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2009-12-12 12:29:29 UTC (rev 7601)
@@ -21,7 +21,7 @@
 PACKAGING_PLATFORMS  = solaris8-sparc  solaris8-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
-EXTRA_BUILD_ISAS_i386  = pentium_pro
+#EXTRA_BUILD_ISAS_i386  = pentium_pro
 EXTRA_BUILD_ISAS_sparc = sparcv9
 
 NGINXCPU_pentium_pro = pentiumpro
@@ -35,16 +35,16 @@
 CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU)
 CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl"
 CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)"
-CONFIGURE_ARGS += --prefix=$(prefix)/var/nginx
 CONFIGURE_ARGS += --conf-path=$(sysconfdir)/nginx/nginx.conf
 CONFIGURE_ARGS += --sbin-path=$(sbindir)/nginx
-CONFIGURE_ARGS += --lock-path=$(prefix)/var/run/nginx/nginx.lock
-CONFIGURE_ARGS += --pid-path=$(prefix)/var/run/nginx/nginx.pid
-CONFIGURE_ARGS += --http-client-body-temp-path=$(prefix)/var/nginx/client
-CONFIGURE_ARGS += --http-fastcgi-temp-path=$(prefix)/var/nginx/fastcgi
-CONFIGURE_ARGS += --http-proxy-temp-path=$(prefix)/var/nginx/proxy
-CONFIGURE_ARGS += --error-log-path=$(prefix)/var/nginx/logs/error.log
-CONFIGURE_ARGS += --http-log-path=$(prefix)/var/nginx/logs/access.log
+CONFIGURE_ARGS += --prefix=$(localstatedir)/nginx
+CONFIGURE_ARGS += --lock-path=$(localstatedir)/nginx/nginx.lock
+CONFIGURE_ARGS += --pid-path=$(localstatedir)/nginx/nginx.pid
+CONFIGURE_ARGS += --http-client-body-temp-path=$(localstatedir)/nginx/client
+CONFIGURE_ARGS += --http-fastcgi-temp-path=$(localstatedir)/nginx/fastcgi
+CONFIGURE_ARGS += --http-proxy-temp-path=$(localstatedir)/nginx/proxy
+CONFIGURE_ARGS += --error-log-path=$(localstatedir)/nginx/logs/error.log
+CONFIGURE_ARGS += --http-log-path=$(localstatedir)/nginx/logs/access.log
 CONFIGURE_ARGS += --with-md5=YES
 CONFIGURE_ARGS += --with-sha1=YES
 CONFIGURE_ARGS += --with-http_ssl_module
@@ -55,7 +55,7 @@
 
 TEST_SCRIPTS =
 
-PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }'
+#PROTOTYPE_FILTER = awk '$$$$3 ~ /\/var\/((log|run)|(svc|(svc\/(manifest|manifest\/site))))$$$$/ { $$$$6 = "sys" } $$$$3 ~ /\/var\/nginx\/(client|fastcgi|proxy)$$$$/ { $$$$4 = "700" } { print }'
 
 include gar/category.mk
 
@@ -70,11 +70,11 @@
 	ginstall -d $(DESTDIR)$(sysconfdir)/nginx/conf.d
 	ginstall -d $(DESTDIR)$(sharedstatedir)/nginx/contrib
 	ginstall -d $(DESTDIR)$(docdir)/nginx
-	ginstall -d $(DESTDIR)$(prefix)/var/nginx/client
-	ginstall -d $(DESTDIR)$(prefix)/var/nginx/fastcgi
-	ginstall -d $(DESTDIR)$(prefix)/var/nginx/logs
-	ginstall -d $(DESTDIR)$(prefix)/var/nginx/proxy
-	ginstall -d $(DESTDIR)$(prefix)/var/nginx/sites
+	ginstall -d $(DESTDIR)$(localstatedir)/nginx/client
+	ginstall -d $(DESTDIR)$(localstatedir)/nginx/fastcgi
+	ginstall -d $(DESTDIR)$(localstatedir)/nginx/logs
+	ginstall -d $(DESTDIR)$(localstatedir)/nginx/proxy
+	ginstall -d $(DESTDIR)$(localstatedir)/nginx/sites
 	mv $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params $(DESTDIR)$(sysconfdir)/nginx/fastcgi_params.CSW
 	mv $(DESTDIR)$(sysconfdir)/nginx/mime.types $(DESTDIR)$(sysconfdir)/nginx/mime.types.CSW
 	mv $(DESTDIR)$(sysconfdir)/nginx/nginx.conf $(DESTDIR)$(sysconfdir)/nginx/nginx.conf.CSW


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