gnucash maint: Bug 766960 - gnucash-make-guids fails to run due to hardcoded paths.

John Ralls jralls at code.gnucash.org
Sun May 29 18:56:58 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash/commit/5d69ec7d (commit)
	from  https://github.com/Gnucash/gnucash/commit/a7a0dbcc (commit)



commit 5d69ec7d87bb40c5f652525db123c517bf33c614
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun May 29 15:56:41 2016 -0700

    Bug 766960 - gnucash-make-guids fails to run due to hardcoded paths.

diff --git a/src/bin/overrides/CMakeLists.txt b/src/bin/overrides/CMakeLists.txt
index 0390377..371d313 100644
--- a/src/bin/overrides/CMakeLists.txt
+++ b/src/bin/overrides/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(GNC_BUILDDIR ${CMAKE_BINARY_DIR})
 
 CONFIGURE_FILE(gnucash-make-guids.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-make-guids)
 GNC_CONFIGURE(gnucash-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-env)
-GNC_CONFIGURE(guile.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/guile)
+GNC_CONFIGURE(guile.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/guile) #not installed
 GNC_CONFIGURE(gnucash-build-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-build-env)   # not installed
 
 SET(SCRIPT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -28,6 +28,5 @@ INSTALL(
     PROGRAMS
       ${SCRIPT_OUTPUT_DIR}/gnucash-env
       ${SCRIPT_OUTPUT_DIR}/gnucash-make-guids
-      ${SCRIPT_OUTPUT_DIR}/guile
     DESTINATION libexec/gnucash/overrides
-)
\ No newline at end of file
+)
diff --git a/src/bin/overrides/Makefile.am b/src/bin/overrides/Makefile.am
index 2476cdf..74fb50a 100644
--- a/src/bin/overrides/Makefile.am
+++ b/src/bin/overrides/Makefile.am
@@ -2,8 +2,7 @@ gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
 # When you add a file here, please modify ../test/Makefile.am's overrides.stamp
 gncoverrides_SCRIPTS = \
   gnucash-env \
-  gnucash-make-guids \
-  guile
+  gnucash-make-guids
 
 EXTRA_DIST = \
   gnucash-env.in \
@@ -11,7 +10,7 @@ EXTRA_DIST = \
   gnucash-make-guids \
   guile.in 
 
-noinst_DATA = gnucash-build-env
+noinst_DATA = gnucash-build-env guile
 
 PWD := $(shell pwd)
 
diff --git a/src/bin/overrides/gnucash-make-guids.in b/src/bin/overrides/gnucash-make-guids.in
index d03e135..df501ce 100755
--- a/src/bin/overrides/gnucash-make-guids.in
+++ b/src/bin/overrides/gnucash-make-guids.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-exec gnucash-env @GUILE@ -s "$0" "$@"
+exec gnucash-env guile -s "$0" "$@"
 !#
 
 (define (usage)



Summary of changes:
 src/bin/overrides/CMakeLists.txt        | 5 ++---
 src/bin/overrides/Makefile.am           | 5 ++---
 src/bin/overrides/gnucash-make-guids.in | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)



More information about the gnucash-changes mailing list