[freeorion] 03/09: Install freeorion libraries into MULTIARCH directories.
Markus Koschany
apo at moszumanska.debian.org
Tue Sep 27 13:18:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository freeorion.
commit 9632e7c4b0b1601b3c850a7af560f93428e0afb7
Author: Markus Koschany <apo at debian.org>
Date: Mon Sep 26 17:58:40 2016 +0200
Install freeorion libraries into MULTIARCH directories.
---
debian/freeorion.install | 2 +-
debian/rules | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/freeorion.install b/debian/freeorion.install
index fe7f9eb..a6bb981 100644
--- a/debian/freeorion.install
+++ b/debian/freeorion.install
@@ -1,4 +1,4 @@
debian/bin/* usr/games
usr/bin/* usr/lib/freeorion
-usr/lib/freeorion
+usr/lib/*/freeorion/*
usr/share/applications
diff --git a/debian/rules b/debian/rules
index 4c64f8b..8d87591 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
#export DH_VERBOSE=1
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
WEAK_HOSTS := armel armhf
ifneq (,$(findstring $(DEB_HOST_ARCH),$(WEAK_HOSTS)))
@@ -29,7 +30,7 @@ override_dh_auto_build-indep:
#workaround for 'dpkg-shlibdeps: error: couldn't find library libGiGi*.so'
override_dh_shlibdeps:
- LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/freeorion/freeorion:$(LD_LIBRARY_PATH)" dh_shlibdeps
+ LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/freeorion:$(LD_LIBRARY_PATH)" dh_shlibdeps
override_dh_installchangelogs:
dh_installchangelogs ChangeLog.md
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeorion.git
More information about the Pkg-games-commits
mailing list