IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Ralls
2016-05-29 15:56:41 -07:00
parent a7a0dbcc4b
commit 5d69ec7d87
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/overrides/CMakeLists.txt
View File

@@ -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
)
)

5
src/bin/overrides/Makefile.am
View File

@@ -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)

2
src/bin/overrides/gnucash-make-guids.in
View File

@@ -1,5 +1,5 @@
#!/bin/sh
exec gnucash-env @GUILE@ -s "$0" "$@"
exec gnucash-env guile -s "$0" "$@"
!#
(define (usage)