[kupfer] Move main kupfer binary to bin/kupfer.in

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 08bbd7b10a9216fef99469cc90335d3771704e31
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Thu Feb 11 12:25:31 2010 +0100

    Move main kupfer binary to bin/kupfer.in

 kupfer-activate.sh => bin/kupfer.in |    2 +-
 kupfer-run                          |    1 +
 wscript                             |   14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/kupfer-activate.sh b/bin/kupfer.in
similarity index 96%
rename from kupfer-activate.sh
rename to bin/kupfer.in
index 7cfe798..cc9bcd8 100755
--- a/kupfer-activate.sh
+++ b/bin/kupfer.in
@@ -22,7 +22,7 @@
 PYTHON="@PYTHON@"
 PYTHONDIR="@PYTHONDIR@"
 test ${PYTHON:0:1} = "@" && PYTHON=python
-test ${PYTHONDIR:0:1} = "@" && PYTHONDIR=$(dirname $0)
+test ${PYTHONDIR:0:1} = "@" && PYTHONDIR=$(dirname $(realpath $0))/..
 
 # We allow either ``kupfer QUERY`` to pass text on the command line,
 # or reading directly from stdin if we pipe text into Kupfer
diff --git a/kupfer-run b/kupfer-run
new file mode 120000
index 0000000..eebac8f
--- /dev/null
+++ b/kupfer-run
@@ -0,0 +1 @@
+bin/kupfer.in
\ No newline at end of file
diff --git a/wscript b/wscript
index 36a6079..aad4194 100644
--- a/wscript
+++ b/wscript
@@ -196,6 +196,8 @@ def _dict_slice(D, keys):
 def build(bld):
 	# always read new version
 	bld.env["VERSION"] = VERSION
+
+	# kupfer/
 	# kupfer module version info file
 	version_subst_file = "kupfer/version_subst.py"
 	obj = bld.new_task_gen("subst",
@@ -213,13 +215,10 @@ def build(bld):
 	# Add all Python packages recursively
 	_find_packages_in_directory(bld, "kupfer")
 
-	# binary
-	# Subst in the python version
-	# We have to put this in an intermediate build directory,
-	# inside data/ not to clash with the 'kupfer' module(!)
-	binary_subst_file = "kupfer-activate.sh"
+	# bin/
+	# Write in some variables in the shell script binaries
 	bld.new_task_gen("subst",
-		source = binary_subst_file,
+		source = "bin/kupfer.in",
 		target = "bin/kupfer",
 		install_path = "${BINDIR}",
 		chmod = 0755,
@@ -233,7 +232,7 @@ def build(bld):
 		dict = _dict_slice(bld.env, "PACKAGE LOCALEDIR".split())
 		)
 
-	# Documentation
+	# Documentation/
 	if bld.env["RST2MAN"]:
 		# generate man page from Quickstart.rst
 		bld.new_task_gen(
@@ -254,6 +253,7 @@ def build(bld):
 				bld.env)
 		bld.symlink_as("${MANDIR}/man1/kupfer-exec.1.gz", man_path)
 
+	# Separate subdirectories
 	bld.add_subdirs("po auxdata data extras")
 
 def intlupdate(util):