Fix bad string in extrahd.cgi "founded drives".

[people/pmueller/ipfire-2.x.git] / lfs / GeoIP

diff --git a/lfs/GeoIP b/lfs/GeoIP
index 9b0d26c497994608f4931744c60ec587b8c19772..f488ba2c09a1022941bbf6bb05cdba975fe4a97c 100644 (file)
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,6 +25,7 @@
 include Config
 
 VER        = 1.17
+DATVER     = 01052010
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,13 +37,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) GeoIP.dat
+objects = $(DL_FILE) GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-GeoIP.dat = $(DL_FROM)/GeoIP.dat
+GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat_MD5 = 55aa4d51f7920241296f2fc215d9e559
+GeoIP.dat-$(DATVER).gz_MD5 = 122ac2400bd2df9e999d1260bf04c9b5
 
 install : $(TARGET)
 
@@ -73,10 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && \
-               cp -f $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat
+               zcat $(DIR_DL)/GeoIP.dat-$(DATVER).gz > /usr/local/share/GeoIP/GeoIP.dat
        cd $(DIR_APP) && chmod 777 /srv/web/ipfire/html/images/flags
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)