Skip to content

Commit 57e753a

Browse files
committed
debian packaging fix
1 parent 6a22dba commit 57e753a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

debian/rules

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"lucid"))
3232
TESTMAKE += ARGS="-E PyQgsRectangle"
3333
endif
3434

35+
3536
QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
3637
QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
3738
QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
@@ -57,7 +58,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
5758
MAKEFLAGS += -j$(NUMJOBS)
5859
endif
5960

60-
ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise"))
61+
ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise raring"))
6162
CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
6263
endif
6364

@@ -72,7 +73,8 @@ else
7273
endif
7374

7475
ifneq (,$(findstring $(DISTRIBUTION),"raring"))
75-
CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_GNU_TYPE)/libpython2.7.so
76+
DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
77+
CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
7678
endif
7779

7880
ifneq (,$(findstring -oracle,$(DISTRIBUTION)))

0 commit comments

Comments
 (0)