Merge branch 'branch-1.4' into debian

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index a4cbe2c112147f66a3078cc62f9c6dba11c207e6..c1c9a0f8549297d49fd6b332b7f2492d87a9819c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ prebuild:
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       ./autogen.sh --prefix=/usr
+       PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh \
+               --prefix=/usr --with-google-key=/opt/google/maps-api-key
        touch configure-stamp
 
 build: build-arch build-indep
@@ -20,7 +21,7 @@ build-indep: build-stamp
 
 build-stamp: configure-stamp  
        dh_testdir
-       $(MAKE) VERSION=$(PKG_VERSION)
+       $(MAKE)
        (cd doc ; $(MAKE))
        touch $@