[wxmupen64plus] 15/71: Provide search path to plugins and core in debian/rules

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.

commit 618dd06e03f76064e6f01e3216e02d5392ac3ef2
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Jun 8 10:15:03 2011 +0200

    Provide search path to plugins and core in debian/rules
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1963b46..74ce5c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,5 +8,6 @@ wxmupen64plus (0.1+20110516-1) UNRELEASED; urgency=low
     - Add install_share_path.patch, Install data files to path specified by
       datadir
   * Update Vcs-* fields to new anonscm.debian.org URLs in debian/control
+  * Provide search path to plugins and core in debian/rules
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200
diff --git a/debian/control b/debian/control
index 14bb6c4..fe695e9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/wxmupen64plus.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/wxmupen64plus.git
 Build-Depends:
  debhelper (>= 8.0.0),
+ dpkg-dev (>= 1.16.0),
  hardening-includes,
  python,
  libmupen64plus-dev,
diff --git a/debian/rules b/debian/rules
index 954bf53..80c982c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@ export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 include /usr/share/hardening-includes/hardening.make
-CFLAGS += $(HARDENING_CFLAGS)
-CXXFLAGS += $(HARDENING_CFLAGS)
+CFLAGS += $(HARDENING_CFLAGS) -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
+CXXFLAGS += $(HARDENING_CFLAGS) -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
 LDFLAGS += $(HARDENING_LDFLAGS)
 LDFLAGS += -ldl -lGL
 
@@ -18,8 +18,7 @@ LDFLAGS += -Wl,--as-needed
 
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-MAKEOPTIONS = --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/mupen64plus/' --datadir='/usr/share/wxmupen64plus/' --destdir=debian/tmp
-#DEBUG=1 COREDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/" PLUGINDIR="/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus" MANDIR=/usr/share/man/man6/ BINDIR=/usr/games/
+MAKEOPTIONS = --mupenapi=/usr/include/mupen64plus/ --prefix=/usr --bindir='/usr/games/' --libdir='/usr/lib/$(DEB_HOST_MULTIARCH)/mupen64plus/' --datadir='/usr/share/wxmupen64plus/' --destdir=debian/tmp
 
 %:
 	dh $@ --parallel --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wxmupen64plus.git