Correctly substitute directory names in 'python' executable.

Previously "@libdir@" would typically expand to "${exec_prefix}/…",
which wouldn't have the intended effect.

* modules/Makefile.am (python): New target.
(CLEANFILES): New variable.
* modules/configure.ac: Remove 'AC_CONFIG_FILES' for 'python'.
* modules/python.in: Use @datadir@ instead of @prefix@/share.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 9d7ab54794aa5e05065c4c2b6734c5317c380d72..f621dff8117f7c4b28715575e87e7a215f100e65 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -130,4 +130,15 @@ EXTRA_DIST += \
   env.in \
   COPYING
 
+python: python.in
+       $(SED) -e 's|[@]GUILE[@]|$(GUILE)|g'            \
+              -e 's|[@]GUILE_EFFECTIVE_VERSION[@]|$(GUILE_EFFECTIVE_VERSION)|g' \
+              -e 's|[@]VERSION[@]|$(VERSION)|g'        \
+              -e 's|[@]libdir[@]|$(libdir)|g'          \
+              -e 's|[@]datadir[@]|$(datadir)|g'        \
+          < "$^" > "$@.tmp"
+       mv "$@.tmp" "$@"
+
+CLEANFILES = python
+
 nodist_bin_SCRIPTS = python

diff --git a/modules/configure.ac b/modules/configure.ac
index 9d483d0dac61f075e3b2c05395b096ff3e297fcb..52451232cc6dcef6c284d535b7400fe4560ea2ed 100644 (file)
--- a/modules/configure.ac
+++ b/modules/configure.ac
@@ -13,7 +13,6 @@ GUILE_PKG([3.0 2.2 2.1 2.0])
 GUILE_PROGS
  
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([python], [chmod +x python])
 AC_CONFIG_FILES([env], [chmod +x env])
 AC_OUTPUT
 

diff --git a/modules/python.in b/modules/python.in
index 6b572423aab77b6aeb4c2dcba92910efbd4071a0..5d7849ff626afca08d0e03599e53064b39ff952b 100755 (executable)
--- a/modules/python.in
+++ b/modules/python.in
@@ -4,7 +4,7 @@
 
 (eval-when (expand load eval)
   (set! %load-path
-    (cons "@prefix@/share/guile/site/@GUILE_EFFECTIVE_VERSION@" %load-path))
+    (cons "@datadir@/guile/site/@GUILE_EFFECTIVE_VERSION@" %load-path))
   (set! %load-compiled-path
     (cons "@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache"
           %load-compiled-path)))