From c396e677004e8a53bea4d9e94760a77d173f2b3e Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 25 Nov 2014 14:10:35 +0200 Subject: [PATCH] Update for support creation debian package for amd64 architecture. --HG-- branch : develop --- dist/debian/rules | 10 +++++++++- dist/debian/valentina.install | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dist/debian/rules b/dist/debian/rules index e21dc9e4b..e0ac743b0 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -4,6 +4,14 @@ #export DH_VERBOSE=1 APPNAME := Valentina + + DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + ifeq ($(DEB_HOST_ARCH),amd64) + LIBPATH:= /debian/tmp/usr/lib64 + else + LIBPATH:= /debian/tmp/usr/lib + endif + builddir: mkdir -p builddir @@ -48,7 +56,7 @@ dh_fixperms dh_makeshlibs dh_installdeb - dh_shlibdeps -Llibqmuparser2 -l$(CURDIR)/debian/tmp/usr/lib -Llibvpropertyexplorer -l$(CURDIR)/debian/tmp/usr/lib + dh_shlibdeps -Llibqmuparser2 -l$(CURDIR)$(LIBPATH) -Llibvpropertyexplorer -l$(CURDIR)$(LIBPATH) dh_shlibdeps dh_gencontrol dh_md5sums diff --git a/dist/debian/valentina.install b/dist/debian/valentina.install index 6ab78979b..d9e1b1a92 100644 --- a/dist/debian/valentina.install +++ b/dist/debian/valentina.install @@ -1,5 +1,5 @@ usr/bin/* -usr/lib/lib* +usr/lib* usr/share/valentina/translations/* usr/share/valentina/tables/standard/* usr/share/pixmaps/*