[game-data-packager] 13/14: Replace configure.py mechanism with something that actually works

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 1eeec8be8e118129da431597b3c86c137c4205d5
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 14 12:24:53 2016 +0100

    Replace configure.py mechanism with something that actually works
---
 .gitignore         | 1 +
 Makefile           | 6 +++++-
 tools/configure.py | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6b5d76..87c4558 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /build/
 /build-stamp
+/configure.mk
 /configure-stamp
 /debian/files
 /debian/debhelper-build-stamp
diff --git a/Makefile b/Makefile
index 1af212b..5728c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ datadir := /usr/share
 gamedatadir := ${datadir}
 
 PYTHON := python3
-$(eval $(shell PYTHONPATH=. ${PYTHON} tools/configure.py))
+
+-include configure.mk
 
 pkgdatadir := ${gamedatadir}/game-data-packager
 runtimedir := ${gamedatadir}/game-data-packager-runtime
@@ -78,6 +79,9 @@ default: $(png) $(svgz) $(json_from_data) $(launcher_json) \
       out/bash_completion out/changelog.gz \
       out/game-data-packager out/vfs.zip out/memento-mori-2.svg
 
+configure.mk: tools/configure.py $(wildcard game_data_packager/*.py game_data_packager/*/*.py)
+	PYTHONPATH=. ${PYTHON} tools/configure.py > $@
+
 out/CACHEDIR.TAG:
 	@mkdir -p out
 	( echo "Signature: 8a477f597d28d17""2789f06886806bc55"; \
diff --git a/tools/configure.py b/tools/configure.py
index 9c7dd43..0ab62e8 100755
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -17,15 +17,16 @@
 
 import os
 import sys
+import textwrap
 
 from game_data_packager.packaging import (get_native_packaging_system)
 
 def main():
-    print(get_native_packaging_system().substitute('''
+    print(get_native_packaging_system().substitute(textwrap.dedent('''
     bindir := ${bindir}
     datadir := ${datadir}
     gamedatadir := ${assets}
-    ''', 'unknown-package-name'))
+    '''), 'unknown-package-name'))
 
 if __name__ == '__main__':
     main()

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