Skip to content

Commit f0eeef7

Browse files
committedMay 27, 2015
debian packaging update: make build dir configuable
1 parent 44d6cc3 commit f0eeef7

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed
 

‎debian/changelog

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ qgis (2.9.0) UNRELEASED; urgency=medium
33
* New development version 2.9 after branch of 2.8
44
* include dependency to liblwgeom
55
* 'stretch' package a bit
6+
* merge downstream addition of debug package
7+
* make build directory configurable
68

7-
-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 May 2015 08:34:55 +0200
9+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 28 May 2015 00:35:42 +0200
810

911
qgis (2.8.0) unstable; urgency=medium
1012

‎debian/rules

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
1616
QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
1717

1818
DEB_TEST_TARGET ?= Experimental
19+
BUILDDIR ?= debian/build
1920

2021
QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
2122

@@ -155,7 +156,7 @@ cleantemplates:
155156
$(MAKE) -f debian/rules debian/control debian/compat
156157

157158
binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
158-
dh $@ --with python2 --parallel --builddirectory=debian/build
159+
dh $@ --with python2 --parallel --builddirectory=$(BUILDDIR)
159160

160161
override_dh_clean: cleantemplates
161162
dh_clean
@@ -164,7 +165,7 @@ override_dh_clean: cleantemplates
164165
-$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp
165166
-$(RM) $(CURDIR)/src/core/qgsexpression_texts.cpp
166167

167-
-$(RM) -r $(CURDIR)/debian/build/
168+
-$(RM) -r $(CURDIR)/$(BUILDDIR)/
168169

169170
override_dh_auto_configure: templates
170171
dh_auto_configure -- $(CMAKE_OPTS)
@@ -176,9 +177,9 @@ override_dh_auto_test:
176177
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
177178
-LOCPATH=$(CURDIR)/debian/tmp/locale/ \
178179
LC_ALL=en_US.UTF-8 \
179-
LD_LIBRARY_PATH=$(CURDIR)/debian/build/output/lib:$(LD_LIBRARY_PATH) \
180+
LD_LIBRARY_PATH=$(CURDIR)/$(BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
180181
PATH=/usr/sbin:$(PATH) \
181-
$(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
182+
$(TESTMAKE) -C $(BUILDDIR) $(DEB_TEST_TARGET)
182183
else
183184
override_dh_auto_test:
184185
@echo Skipping tests.

0 commit comments

Comments
 (0)
Please sign in to comment.