SF.net SVN: gar:[22780] csw/mgar/pkg/mirrorbrain/trunk/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sat Jan 4 23:02:26 CET 2014


Revision: 22780
          http://sourceforge.net/p/gar/code/22780
Author:   dmichelsen
Date:     2014-01-04 22:02:23 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
mirrorbrain/trunk: More progress

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

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-04 20:57:55 UTC (rev 22779)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-01-04 22:02:23 UTC (rev 22780)
@@ -16,8 +16,8 @@
 
 # Apache paths
 AP2_ROOT      = $(prefix)/apache2
-AP2_LIBEXEC   = $(DESTDIR)$(AP2_ROOT)/libexec
-AP2_EXTRACONF = $(DESTDIR)$(AP2_ROOT)/etc/extra
+AP2_LIBEXEC   = $(AP2_ROOT)/libexec
+AP2_EXTRACONF = $(AP2_ROOT)/etc/extra
 AP2_SBIN      = $(AP2_ROOT)/sbin
 APXS          = $(AP2_SBIN)/apxs
 
@@ -38,8 +38,44 @@
 CHECKPKG_OVERRIDES_CSWap2-mod-mirrorbrain += surplus-dependency|CSWap2modgeoip
 CHECKPKG_OVERRIDES_CSWap2-mod-mirrorbrain += surplus-dependency|CSWlibaprutil1-dbd-pgsql
 
+PACKAGES += CSWap2-mod-autoindex-mb
+SPKG_DESC_CSWap2-mod-autoindex-mb = Modified autoindex Module for Apache
+PKGFILES_CSWap2-mod-autoindex-mb += $(AP2_LIBEXEC)/mod_autoindex_mb.so
+RUNTIME_DEP_PKGS_CSWap2-mod-autoindex-mb += CSWapache2
+
+PACKAGES += CSWmirrorbrain-tools
+SPKG_DESC_CSWmirrorbrain-tools = Tools for administering a MirrorBrain Server
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpy-cmdln
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpy-mb
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpy-sqlobject
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWpy-psycopg2
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWlibgeoip1
+RUNTIME_DEP_PKGS_CSWmirrorbrain-tools += CSWperl
+# I know these are needed
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-cmdln
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-mb
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-sqlobject
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWpy-psycopg2
+CHECKPKG_OVERRIDES_CSWmirrorbrain-tools += surplus-dependency|CSWperl
+
 # The Python CSWpy-mb module "mb" and the "mb" binary are in lang-py/mb
 
+REINPLACEMENTS += python
+REINPLACE_MATCH_python = \#!.*python.*
+REINPLACE_WITH_python = \#!$(bindir)/python
+REINPLACE_FILES_python += tools/null-rsync
+
+REINPLACEMENTS += perl
+REINPLACE_MATCH_perl = \#!.*perl.*
+REINPLACE_WITH_perl = \#!$(bindir)/perl -w
+REINPLACE_FILES_perl += tools/scanner.pl
+
+REINPLACEMENTS += mbconf
+REINPLACE_MATCH_mbconf = /etc/mirrorbrain.conf
+REINPLACE_WITH_mbconf = $(sysconfdir)/mirrorbrain.conf
+REINPLACE_FILES_mbconf += tools/scanner.pl
+
 GEOIPCITYFILE = $(sharedstatedir)/GeoIP/GeoIPCity.dat
 GEOIPFILE = $(sharedstatedir)/GeoIP/GeoIP.dat
 
@@ -57,18 +93,20 @@
 build-custom:
 	cd $(WORKSRC)/mod_mirrorbrain && $(APXS) -c mod_mirrorbrain.c
 	cd $(WORKSRC)/mod_autoindex_mb && $(APXS) -c mod_autoindex_mb.c
-	cd $(WORKSRC)/tools && $(CC) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -DDEFAULT_GEOIPCITYFILE=\"$(GEOIPCITYFILE)\" -lGeoIP geoiplookup_city.c -o geoiplookup_city
-	cd $(WORKSRC)/tools && $(CC) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -DDEFAULT_GEOIPFILE=\"$(GEOIPFILE)\" -lGeoIP geoiplookup_continent.c -o geoiplookup_continent
+	cd $(WORKSRC)/tools && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -DDEFAULT_GEOIPCITYFILE=\"$(GEOIPCITYFILE)\" -lGeoIP geoiplookup_city.c -o geoiplookup_city
+	cd $(WORKSRC)/tools && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(CPPFLAGS) $(CFLAGS) $(LINKER_FLAGS) -DDEFAULT_GEOIPFILE=\"$(GEOIPFILE)\" -lGeoIP geoiplookup_continent.c -o geoiplookup_continent
 	@$(MAKECOOKIE)
 
 install-custom:
-	mkdir -p $(AP2_LIBEXEC)
-	cd $(WORKSRC)/mod_mirrorbrain && $(APXS) -lm -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_mirrorbrain.la
-	cd $(WORKSRC)/mod_autoindex_mb && $(APXS) -lm -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_autoindex_mb.la
+	mkdir -p $(DESTDIR)$(AP2_LIBEXEC)
+	cd $(WORKSRC)/mod_mirrorbrain && $(APXS) -lm -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_mirrorbrain.la
+	cd $(WORKSRC)/mod_autoindex_mb && $(APXS) -lm -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_autoindex_mb.la
 	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
 	ginstall -m 0644 $(WORKSRC)/mod_mirrorbrain/mod_mirrorbrain.conf $(DESTDIR)$(prefix)/apache2/etc/extra/mod_mirrorbrain.conf.CSW
 	ginstall -d $(DESTDIR)$(bindir)
 	ginstall -m 0755 $(WORKSRC)/tools/geoiplookup_city $(DESTDIR)$(bindir)/geoiplookup_city
 	ginstall -m 0755 $(WORKSRC)/tools/geoiplookup_continent $(DESTDIR)$(bindir)/geoiplookup_continent
+	ginstall -m 0755 $(WORKSRC)/tools/null-rsync $(DESTDIR)$(bindir)/null-rsync
+	ginstall -m 0755 $(WORKSRC)/tools/scanner.pl $(DESTDIR)$(bindir)/scanner
 	@$(MAKECOOKIE)
 

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



More information about the devel mailing list