Revision: 21843
http://gar.svn.sourceforge.net/gar/?rev=21843&view=rev
Author: wilbury
Date: 2013-08-26 22:06:22 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
mod_geoip/trunk: Adjust build environment
Modified Paths:
--------------
csw/mgar/pkg/mod_geoip/trunk/Makefile
Modified: csw/mgar/pkg/mod_geoip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_geoip/trunk/Makefile 2013-08-26 21:16:56 UTC (rev
21842)
+++ csw/mgar/pkg/mod_geoip/trunk/Makefile 2013-08-26 22:06:22 UTC (rev
21843)
@@ -29,14 +29,14 @@
BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWapache2-dev
BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWgeoip-dev
-#RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWapache2
-#RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWgeolitedb
-#RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWlibgeoip1
-PKGFILES_CSWap2modgeoip2 += $(AP2_LIBEXEC)/mod_geoip.so
+RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWapache2
+RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWgeolitedb
+RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWlibgeoip1
+#PKGFILES_CSWap2modgeoip2 += $(AP2_LIBEXEC)/mod_geoip2.so
# This dependency should be in place.
-#CHECKPKG_OVERRIDES_CSWap2modgeoip2 += surplus-dependency|CSWgeolitedb
-#CHECKPKG_OVERRIDES_CSWap2modgeoip2 += surplus-dependency|CSWlibgeoip1
+CHECKPKG_OVERRIDES_CSWap2modgeoip2 += surplus-dependency|CSWgeolitedb
+CHECKPKG_OVERRIDES_CSWap2modgeoip2 += surplus-dependency|CSWlibgeoip1
LICENSE_TEXT = Apache
@@ -48,9 +48,13 @@
include gar/category.mk
+post-extract:
+ @-gmv $(WORKSRC)/mod_geoip.c $(WORKSRC)/mod_geoip2.c
+ @$(MAKECOOKIE)
+
build-custom:
@ginstall -d -m 755 $(AP2_LIBEXEC)
- @$(AP2_APXS) -L$(prefix)/lib -lGeoIP -S LIBEXECDIR=$(AP2_LIBEXEC)/ -i
-c $(WORKSRC)/mod_geoip.c
+ @$(BUILD_ENV) $(AP2_APXS) -L$(prefix)/lib -lGeoIP -S
LIBEXECDIR=$(AP2_LIBEXEC)/ -i -c $(WORKSRC)/mod_geoip2.c
@$(MAKECOOKIE)
install-custom:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
