[wxmupen64plus] 12/71: Make installpath for wxmupen64plus binary configurable

[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 9ceaf1dc26691b3272aef279800373ce70a7e324
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 22 23:12:07 2011 +0200

    Make installpath for wxmupen64plus binary configurable
---
 debian/changelog                              |  3 ++-
 debian/patches/install_games.patch            | 26 +++++++++++++++++++-------
 debian/patches/series                         |  2 +-
 debian/patches/single_window.patch            | 12 ++++++++++++
 debian/patches/wscript_configurable_dir.patch |  4 ++--
 debian/rules                                  |  2 +-
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01a3ad5..0bb29f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ wxmupen64plus (0.1+20110516-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #TODO)
   * debian/patches:
-    - Add install_games.patch, Install under /usr/games
+    - Add install_games.patch, Make installpath for wxmupen64plus binary
+      configurable
     - Add wscript_configurable_dir.patch, Add datadir and libdir flags
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200
diff --git a/debian/patches/install_games.patch b/debian/patches/install_games.patch
index 97d0443..53cfff1 100644
--- a/debian/patches/install_games.patch
+++ b/debian/patches/install_games.patch
@@ -1,17 +1,29 @@
-Description: Install under /usr/games
+Description: Make installpath for wxmupen64plus binary configurable
 Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/wscript b/wscript
-index 3f56a7956eaa2f48bb13924d7650cf75dd8d8200..193c313daff18b1bfaf1e5ffa964c9a6e427363c 100644
+index c5b119d1a433219b84ddf43bd0eb29d86220096b..2727ec37fbb3a837c52f907a3eb82f1acbf98c7a 100644
 --- a/wscript
 +++ b/wscript
-@@ -115,7 +115,7 @@ def build(bld):
-     else:
-         build_flags += ['-O2','-DNEBUG=1']
- 
+@@ -32,6 +32,7 @@ def options(opt):
+     opt.add_option('--wxconfig_args', action='store', help='Additional arguments passed to wx-config', default='',  dest='wxconfig_args')
+     opt.add_option('--datadir', action='store', help='(Optional) the directory where to look for data files', default='',  dest='datadir')
+     opt.add_option('--libdir', action='store', help='(Optional) the directory where to look for plugin files', default='',  dest='libdir')
++    opt.add_option('--bindir', action='store', help='(Optional) the directory where to install wxmupen64plus binary', default='',  dest='bindir')
+     
+     if os.name == 'nt':
+         opt.add_option('--wxhome', action='store', help='Where your wxWidgets build is installed', default=None,  dest='wxhome')
+@@ -123,8 +124,10 @@ def build(bld):
+         build_flags += ['-DDATADIR="' + bld.env['datadir'] + '"']
+     if len(bld.env['libdir']) > 0:
+         build_flags += ['-DLIBDIR="' + bld.env['libdir'] + '"']
+-
 -    bin_install_path = "${PREFIX}/bin"
-+    bin_install_path = "${PREFIX}/games"
++    if len(bld.env['bindir']) > 0:
++        bin_install_path = bld.env['bindir']
++    else:
++        bin_install_path = "${PREFIX}/bin"
  
      osal_src = []
      additional_links = []
diff --git a/debian/patches/series b/debian/patches/series
index 75619fc..4cefcd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
+wscript_configurable_dir.patch
 install_games.patch
 single_window.patch
-wscript_configurable_dir.patch
diff --git a/debian/patches/single_window.patch b/debian/patches/single_window.patch
index 1059fa2..a161e76 100644
--- a/debian/patches/single_window.patch
+++ b/debian/patches/single_window.patch
@@ -18,3 +18,15 @@ index 70f7b051fdb78c182a72fe24b944eee7dfc4efb5..b0ccb7c7163e09f501406ad57ebf5b50
  };
  
  #endif
+diff --git a/wscript b/wscript
+index 2727ec37fbb3a837c52f907a3eb82f1acbf98c7a..91789c8df20a04e51eb1d62b9fcc2255a93107f0 100644
+--- a/wscript
++++ b/wscript
+@@ -82,6 +82,7 @@ def configure(ctx):
+     ctx.env['wxhome'] = wxhome
+     ctx.env['datadir'] = Options.options.datadir
+     ctx.env['libdir'] = Options.options.libdir
++    ctx.env['bindir'] = Options.options.bindir
+     
+     ctx.find_program('gcc', var='GCC', mandatory=True)
+     ctx.find_program('g++', var='GPP', mandatory=True)
diff --git a/debian/patches/wscript_configurable_dir.patch b/debian/patches/wscript_configurable_dir.patch
index 2fc8a77..53721c3 100644
--- a/debian/patches/wscript_configurable_dir.patch
+++ b/debian/patches/wscript_configurable_dir.patch
@@ -4,7 +4,7 @@ Origin: backport, https://bitbucket.org/auria/wxmupen64plus/changeset/a0763d9c6c
 
 ---
 diff --git a/wscript b/wscript
-index 193c313daff18b1bfaf1e5ffa964c9a6e427363c..06394befeea10b6dcf369632532973ad450df160 100644
+index 3f56a7956eaa2f48bb13924d7650cf75dd8d8200..c5b119d1a433219b84ddf43bd0eb29d86220096b 100644
 --- a/wscript
 +++ b/wscript
 @@ -30,6 +30,8 @@ def options(opt):
@@ -34,6 +34,6 @@ index 193c313daff18b1bfaf1e5ffa964c9a6e427363c..06394befeea10b6dcf369632532973ad
 +    if len(bld.env['libdir']) > 0:
 +        build_flags += ['-DLIBDIR="' + bld.env['libdir'] + '"']
 +
-     bin_install_path = "${PREFIX}/games"
+     bin_install_path = "${PREFIX}/bin"
  
      osal_src = []
diff --git a/debian/rules b/debian/rules
index f9fb7af..954bf53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +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 --libdir=/usr/lib/mupen64plus --datadir=/usr/share/wxmupen64plus/ --destdir=debian/tmp
+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/
 
 %:

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