X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=debian%2Frules;h=ebcb3b803dfd4e5c90b16b857cf5a23b8c739149;hp=028b548f31990072a505fc75f3818cd60abd8ccd;hb=5d4f912bcc6784f975c82f7b0ed8dc360e60aae8;hpb=fc7e46b1215ea2b4cc138ed77d8eaa122369b15f

diff --git a/debian/rules b/debian/rules
index 028b548f..ebcb3b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; f
 # this target invoked by git-buildpackage using a clean hook, see .gbp.conf
 prebuild:
 	echo $(DEB_VERSION)
-	git-dch --release --new-version=$(DEB_VERSION)
+	git-dch --release --new-version=$(DEB_VERSION) --multimaint-merge
 	git log > ChangeLog
 	git commit -n ChangeLog debian/changelog \
 		-m "update changelogs for Debian build"
@@ -18,7 +18,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
@@ -27,7 +28,7 @@ build-indep: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
-	$(MAKE) VERSION=$(PKG_VERSION)
+	$(MAKE)
 	(cd doc ; $(MAKE))
 	touch $@