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

[wilbury at users.sourceforge.net]

Revision: 21841
          http://gar.svn.sourceforge.net/gar/?rev=21841&view=rev
Author:   wilbury
Date:     2013-08-26 21:11:36 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
mod_geoip/trunk: Try without explicit dependencies.

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 20:40:46 UTC (rev 21840)
+++ csw/mgar/pkg/mod_geoip/trunk/Makefile	2013-08-26 21:11:36 UTC (rev 21841)
@@ -29,10 +29,10 @@
 
 BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWapache2-dev
 BUILD_DEP_PKGS_CSWap2modgeoip2 += CSWgeoip-dev
-RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWapache2
+#RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWapache2
 #RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWgeolitedb
 #RUNTIME_DEP_PKGS_CSWap2modgeoip2 += CSWlibgeoip1
-PKGFILES_CSWap2modgeoip2 += $(AP2_ROOT)/libexec/mod_geoip2.so
+PKGFILES_CSWap2modgeoip2 += $(AP2_LIBEXEC)/mod_geoip2.so
 
 # This dependency should be in place.
 #CHECKPKG_OVERRIDES_CSWap2modgeoip2 += surplus-dependency|CSWgeolitedb
@@ -49,11 +49,10 @@
 include gar/category.mk
 
 build-custom:
-	$(AP2_APXS) -L$(prefix)/lib -lGeoIP -c $(WORKSRC)/mod_geoip.c
+	@ginstall -d -m 755 $(AP2_LIBEXEC)
+	@$(AP2_APXS) -L$(prefix)/lib -lGeoIP -S LIBEXECDIR=$(AP2_LIBEXEC)/ -i -c $(WORKSRC)/mod_geoip.c
 	@$(MAKECOOKIE)
 
 install-custom:
-	@ginstall -d -m 755 $(DESTDIR)$(AP2_ROOT)/libexec
-	@ginstall -m 755 $(WORKSRC)/mod_geoip.o $(DESTDIR)$(AP2_ROOT)/libexec/mod_geoip2.so
 	@$(MAKECOOKIE)
 

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