[wxmupen64plus] 13/71: Install data files to path specified by datadir

[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 cf3e97312adeb8256ee1791c67bdda3c06e0ab94
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 22 23:24:13 2011 +0200

    Install data files to path specified by datadir
---
 debian/changelog                        |  2 ++
 debian/patches/install_share_path.patch | 21 +++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0bb29f8..6cf7468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,7 @@ wxmupen64plus (0.1+20110516-1) UNRELEASED; urgency=low
     - Add install_games.patch, Make installpath for wxmupen64plus binary
       configurable
     - Add wscript_configurable_dir.patch, Add datadir and libdir flags
+    - Add install_share_path.patch, Install data files to path specified by
+      datadir
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200
diff --git a/debian/patches/install_share_path.patch b/debian/patches/install_share_path.patch
new file mode 100644
index 0000000..a7b47a8
--- /dev/null
+++ b/debian/patches/install_share_path.patch
@@ -0,0 +1,21 @@
+Description: Install data files to path specified by datadir
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/wscript b/wscript
+index 91789c8df20a04e51eb1d62b9fcc2255a93107f0..8592c587de10fe95512ae542e87bcde33c111b9c 100644
+--- a/wscript
++++ b/wscript
+@@ -165,7 +165,11 @@ def build(bld):
+         
+         # install target
+         data_dir = bld.path.find_dir('data')
+-        bld.install_files('${PREFIX}/share/wxmupen64plus/', data_dir.ant_glob('*'))
++        if len(bld.env['datadir']) > 0:
++            share_path = bld.env['datadir']
++        else:
++            share_path = '${PREFIX}/share/wxmupen64plus/'
++        bld.install_files(share_path, data_dir.ant_glob('*'))
+ 
+ 
+     # Build the program
diff --git a/debian/patches/series b/debian/patches/series
index 4cefcd2..d4485b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 wscript_configurable_dir.patch
 install_games.patch
 single_window.patch
+install_share_path.patch

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