gnucash unstable: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Fri Dec 1 17:52:23 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/0a8e5006 (commit)
via https://github.com/Gnucash/gnucash/commit/9b0a8723 (commit)
from https://github.com/Gnucash/gnucash/commit/a120c48f (commit)
commit 0a8e50069c7e0d82389fc18a2198cc8580686e46
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 1 13:56:43 2017 -0800
Remove overrides directory as being obsolete.
Also don't install qof test headers to libexec.
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 49b9d40..fe928ce 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -9,7 +9,6 @@ ADD_SUBDIRECTORY (import-export)
ADD_SUBDIRECTORY (python)
ADD_SUBDIRECTORY (register)
ADD_SUBDIRECTORY (report)
-ADD_SUBDIRECTORY (overrides)
ADD_SUBDIRECTORY (test)
ADD_DEFINITIONS (-DHAVE_CONFIG_H)
diff --git a/gnucash/overrides/CMakeLists.txt b/gnucash/overrides/CMakeLists.txt
deleted file mode 100644
index 1ca1c47..0000000
--- a/gnucash/overrides/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-SET(GNC_PKGLIB_INSTALLDIR ${PKGLIBDIR})
-SET(GNC_SCM_INSTALLDIR ${SCHEME_INSTALLED_SOURCE_DIR})
-SET(GNC_LIB_INSTALLDIR ${LIBDIR})
-SET(GNC_PYTHON_DIR ${GNUCASH_PATH_DIR})
-SET(GUILE ${GUILE_EXECUTABLE})
-SET(GNC_SRCDIR ${CMAKE_SOURCE_DIR})
-SET(GNC_BUILDDIR ${CMAKE_BINARY_DIR})
-
-CONFIGURE_FILE(gnucash-make-guids.in gnucash-make-guids)
-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) #not installed
-GNC_CONFIGURE(gnucash-build-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-build-env) # not installed
-
-SET_DIST_LIST(overrides_DIST CMakeLists.txt gnucash-build-env.in gnucash-env.in gnucash-make-guids.in guile.in Makefile.am)
-
-SET(SCRIPT_OUTPUT_DIR ${LIBDIR_BUILD}exec/gnucash/overrides)
-
-FOREACH(file gnucash-make-guids gnucash-env guile gnucash-build-env)
- FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${file}
- DESTINATION ${SCRIPT_OUTPUT_DIR}
- FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
-ENDFOREACH(file)
-
-INSTALL(
- PROGRAMS
- ${SCRIPT_OUTPUT_DIR}/gnucash-env
- ${SCRIPT_OUTPUT_DIR}/gnucash-make-guids
- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gnucash/overrides
-)
diff --git a/gnucash/overrides/Makefile.am b/gnucash/overrides/Makefile.am
deleted file mode 100644
index 29bbe10..0000000
--- a/gnucash/overrides/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-
-EXTRA_DIST = \
- gnucash-env.in \
- gnucash-build-env.in \
- gnucash-make-guids \
- guile.in \
- CMakeLists.txt
-
-noinst_DATA = gnucash-build-env guile
-
-PWD := $(shell pwd)
-
-## We borrow guile's convention and use @-...-@ as the substitution
-## brackets below, instead of the usual @... at . This prevents autoconf
-## from substituting the values directly into the left-hand sides of
-## the sed substitutions. *sigh*
-
-guile: guile.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's#@-GUILE-@#${GUILE}#'
- mv $@.tmp $@
- chmod u+x $@
-CLEANFILES = guile
-
-gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
- -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
- -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e 's#@-GNC_SCRIPT_OVERRIDE_DIR-@#${gncoverridedir}#g' \
- -e 's#@-GNC_PYTHON_DIR-@#${pythondir}#g'
- mv $@.tmp $@
- chmod u+x $@
-CLEANFILES += gnucash-env
-
-gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's#@-GNC_BUILDDIR-@#${abs_top_builddir}#g' \
- -e 's#@-GNC_SRCDIR-@#${abs_top_srcdir}#g'
- mv $@.tmp $@
- chmod u+x $@
-CLEANFILES += gnucash-build-env
diff --git a/gnucash/overrides/gnucash-build-env.in b/gnucash/overrides/gnucash-build-env.in
deleted file mode 100644
index 0a3fb65..0000000
--- a/gnucash/overrides/gnucash-build-env.in
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Usage: gnucash-build-env
-
-# Usage: gnucash-build-env any-cmd [ args ... ]
-# runs any-cmd in gnucash's build environment.
-
-# As with all the other gnucash overrides scripts, expects PATH to be
-# set appropriately.
-
-top_srcdir="@-GNC_SRCDIR-@"
-top_builddir="@-GNC_BUILDDIR-@"
-
-if test "${GNC_CONFIG_PATH}"x = x
-then
- GNC_CONFIG_PATH="(\"${top_srcdir}/libgnucash/scm\")"
- export GNC_CONFIG_PATH
-fi
-
-if test "${GNC_SHARE_PATH}"x = x
-then
- GNC_SHARE_PATH="(\"${top_srcdir}/libgnucash/scm\" \"${top_srcdir}/libgnucash/quotes\")"
- export GNC_SHARE_PATH
-fi
-
-if test "${GNC_DOC_PATH}"x = x
-then
- GNC_DOC_PATH="(\"${top_srcdir}/libgnucash/scm\")"
- export GNC_DOC_PATH
-fi
-
-set +x
-eval `${top_srcdir}/common/gnc-test-env.pl \
- --gnc-module-dir ${top_builddir}/libgnucash/engine \
- --gnc-module-dir ${top_builddir}/libgnucash/tax/us \
- --gnc-module-dir ${top_builddir}/libgnucash/app-utils \
- --gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
- --gnc-module-dir ${top_builddir}/gnucash/gnome-search \
- --gnc-module-dir ${top_builddir}/gnucash/import-export \
- --gnc-module-dir ${top_builddir}/gnucash/import-export/hbci \
- --gnc-module-dir ${top_builddir}/gnucash/import-export/log-replay \
- --gnc-module-dir ${top_builddir}/gnucash/import-export/ofx \
- --gnc-module-dir ${top_builddir}/gnucash/import-export/qif-import \
- --gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \
- --gnc-module-dir ${top_builddir}/gnucash/report/report-gnome \
- --gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \
- --gnc-module-dir ${top_builddir}/gnucash/register/register-core \
- --gnc-module-dir ${top_builddir}/gnucash/register/register-gnome \
- --gnc-module-dir ${top_builddir}/gnucash/register/ledger-core \
-\
- --guile-load-dir ${top_builddir}/libgnucash/app-utils \
- --guile-load-dir ${top_builddir}/libgnucash/core-utils \
- --guile-load-dir ${top_builddir}/libgnucash/gnc-module \
- --guile-load-dir ${top_builddir}/libgnucash/engine \
- --guile-load-dir ${top_builddir}/libgnucash/scm \
- --guile-load-dir ${top_builddir}/libgnucash/tax/us \
- --guile-load-dir ${top_builddir}/gnucash/gnome-utils \
- --guile-load-dir ${top_builddir}/gnucash/import-export/qif-import \
- --guile-load-dir ${top_builddir}/gnucash/report/report-system \
- --guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
- --guile-load-dir ${top_builddir}/gnucash/report/business-reports \
- --guile-load-dir ${top_builddir}/gnucash/report/utility-reports \
- --guile-load-dir ${top_builddir}/gnucash/report/locale-specific/us \
- --guile-load-dir ${top_builddir}/gnucash/report/report-gnome \
- --guile-load-dir ${top_builddir}/gnucash/report/stylesheets \
-\
- --library-dir ${top_builddir}/common/test-core \
- --library-dir ${top_builddir}/libgnucash/core-utils \
- --library-dir ${top_builddir}/libgnucash/app-utils \
- --library-dir ${top_builddir}/libgnucash/app-utils/calculation \
- --library-dir ${top_builddir}/libgnucash/engine \
- --library-dir ${top_builddir}/libgnucash/backend/xml \
- --library-dir ${top_builddir}/libgnucash/backend/sql \
- --library-dir ${top_builddir}/libgnucash/gnc-module \
- --library-dir ${top_builddir}/gnucash/gnome \
- --library-dir ${top_builddir}/gnucash/gnome-search \
- --library-dir ${top_builddir}/gnucash/gnome-utils \
- --library-dir ${top_builddir}/gnucash/html \
- --library-dir ${top_builddir}/gnucash/import-export \
- --library-dir ${top_builddir}/gnucash/register/register-gnome \
- --library-dir ${top_builddir}/gnucash/register/ledger-core \
- --library-dir ${top_builddir}/gnucash/register/register-core \
- --library-dir ${top_builddir}/gnucash/report/report-gnome \
- --library-dir ${top_builddir}/gnucash/report/report-system
- `
-LD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}"
-
-exec "$@"
diff --git a/gnucash/overrides/gnucash-env.in b/gnucash/overrides/gnucash-env.in
deleted file mode 100644
index e9fc640..0000000
--- a/gnucash/overrides/gnucash-env.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Usage: gnucash-env any-cmd [ args ... ]
-# runs any-cmd in an environment appropriate for gnucash.
-# we'll also add a gnucash-build-env later for running from the install tree.
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
-
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
-
-PYTHONPATH="${PYTHONPATH}:@-GNC_PYTHON_DIR-@"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export PYTHONPATH
-
-exec "$@"
diff --git a/gnucash/overrides/gnucash-make-guids.in b/gnucash/overrides/gnucash-make-guids.in
deleted file mode 100755
index df501ce..0000000
--- a/gnucash/overrides/gnucash-make-guids.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-exec gnucash-env guile -s "$0" "$@"
-!#
-
-(define (usage)
- (display "Usage: gnucash-make-guids [number-to-make (default is 100)]\n")
- (exit 1))
-
-(define args (cdr (program-arguments)))
-(define num-to-make 100)
-
-;; Too many arguments
-(if (> (length args) 1)
- (usage))
-
-(if (= (length args) 1)
- (let ((arg (string->number (car args))))
- (if (not (number? arg))
- (usage))
- (set! arg (inexact->exact arg))
- (if (<= arg 0)
- (usage))
- (set! num-to-make arg)))
-
-(use-modules (gnucash gnc-module))
-(gnc:module-system-init)
-(gnc:module-load "gnucash/engine" 0)
-
-(let loop ((remaining num-to-make))
- (display (guid-new-return)) (newline)
- (if (> remaining 1)
- (loop (- remaining 1))))
-
-;; Local Variables:
-;; mode: scheme
-;; End:
diff --git a/gnucash/overrides/guile.in b/gnucash/overrides/guile.in
deleted file mode 100644
index 00ace3f..0000000
--- a/gnucash/overrides/guile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if test "${GNC_GUILE}"x = x
-then
- GNC_GUILE="@-GUILE-@"
-fi
-
-exec ${GNC_GUILE} "$@"
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index b7dbd69..eeeb7f9 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -259,16 +259,6 @@ INSTALL(TARGETS gncmod-engine
INSTALL(FILES ${engine_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-SET(qof_test_HEADERS
-kvp-frame.hpp
-qofbook.h
-qofinstance.h
-qofobject.h
-qofsession.h
-)
-
-INSTALL(FILES ${qof_test_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gnucash/libgnucash/engine/test)
-
# Scheme
SET (engine_SCHEME_0
commit 9b0a8723a4cda8e0a7add96017ceafaab7de86a1
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 30 13:56:47 2017 -0800
More GNUInstallDirs path fixes.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8188e2..0dc6124 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -402,7 +402,7 @@ IF (WITH_PYTHON)
# Determine where to install the python libraries.
EXECUTE_PROCESS(
- COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print sysconfig.get_path('platlib', vars = { 'platbase' : '${CMAKE_INSTALL_PREFIX}' } )"
+ COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print sysconfig.get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}', plat_specific=True)"
RESULT_VARIABLE PYTHON_SYSCONFIG_RESULT
OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT
ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index d79d108..211daff 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -33,6 +33,6 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_TARGET(compiled-schemas ALL DEPENDS ${SCHEMA_BUILD_DIR}/gschemas.compiled)
-INSTALL(FILES ${SCHEMA_BUILD_DIR}/gschemas.compiled DESTINATION ${DATADIR}/glib-2.0/schemas)
+INSTALL(FILES ${SCHEMA_BUILD_DIR}/gschemas.compiled DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
SET_DIST_LIST(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in)
diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt
index 6ea8604..fa72a96 100644
--- a/data/pixmaps/CMakeLists.txt
+++ b/data/pixmaps/CMakeLists.txt
@@ -1,5 +1,5 @@
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION share/gnucash
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash
PATTERN Makefile.* EXCLUDE
PATTERN CMakeLists.txt EXCLUDE
PATTERN hicolor EXCLUDE
@@ -11,7 +11,7 @@ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
PATTERN hicolor EXCLUDE
)
INSTALL(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION share/gnucash/icons
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/icons
REGEX ".*/apps.*" EXCLUDE
)
FILE(
@@ -21,7 +21,7 @@ FILE(
)
INSTALL(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION share/icons
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
REGEX ".*/actions.*" EXCLUDE
)
FILE(
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 5d8548e..52f933e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(doc_noinst_DATA
Makefile.am misc-notes.txt README.build-system README.HBCI README.OFX README.translator.txt tip_of_the_day.list.in
TRANSLATION_HOWTO)
-INSTALL(FILES ${doc_DATA} DESTINATION share/doc/gnucash)
+INSTALL(FILES ${doc_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/gnucash)
SET_LOCAL_DIST(doc_DIST_local ${doc_DATA} ${doc_noinst_DATA})
SET(doc_DIST ${doc_DIST_local} ${examples_DIST} PARENT_SCOPE)
@@ -49,7 +49,7 @@ STRING(CONCAT FINAL_TOTD ${TOTD_OUTPUT})
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list "${FINAL_TOTD}")
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list DESTINATION share/gnucash)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash)
FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list
DESTINATION ${DATADIR_BUILD}/gnucash)
@@ -85,4 +85,4 @@ ADD_CUSTOM_COMMAND(OUTPUT gnucash.1
)
ADD_CUSTOM_TARGET(gnucash-manpage DEPENDS gnucash.1)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.1 DESTINATION share/man/man1)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt
index a73eb4f..f4c024c 100644
--- a/doc/examples/CMakeLists.txt
+++ b/doc/examples/CMakeLists.txt
@@ -21,6 +21,6 @@ SET(examples_DATA
web.qif
)
-INSTALL(FILES ${examples_DATA} DESTINATION share/doc/gnucash)
+INSTALL(FILES ${examples_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/gnucash)
SET_DIST_LIST(examples_DIST ${examples_DATA} CMakeLists.txt Makefile.am)
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 1ba974a..49b9d40 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -235,7 +235,7 @@ IF (WIN32)
ENDFOREACH(line)
FILE(APPEND ${BUILD_CMD_FILE} "\nstart gnucash %*\n")
- INSTALL(PROGRAMS ${CMD_FILE} DESTINATION })
+ INSTALL(PROGRAMS ${CMD_FILE} DESTINATION ${CMAKE_INSTALL_BINDIR})
ENDIF(WIN32)
# The GResource Files are absolute paths but SET_LOCAL_DIST requires
diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
index f754c17..5b6c7f7 100644
--- a/gnucash/gnome-search/CMakeLists.txt
+++ b/gnucash/gnome-search/CMakeLists.txt
@@ -65,7 +65,7 @@ INSTALL(FILES ${gnome_search_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gn
SET(gnome_search_GLADE dialog-search.glade)
-INSTALL(FILES ${gnome_search_GLADE} DESTINATION share/gnucash/gtkbuilder)
+INSTALL(FILES ${gnome_search_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
FILE(COPY .
DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 5c939f0..11fc7ec 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -180,7 +180,7 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_TARGET(gnucash-appdata ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION share/appdata)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata)
#=======
@@ -198,7 +198,7 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION share/applications)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
SET_LOCAL_DIST(gnome_DIST_local
CMakeLists.txt Makefile.am gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
index 57808e1..d873dd2 100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -78,7 +78,7 @@ INSTALL(FILES ${generic_import_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/
SET(generic_import_GLADE dialog-import.glade)
-INSTALL(FILES ${generic_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
+INSTALL(FILES ${generic_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
FILE(COPY ${generic_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 06e7c26..e7173f7 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -81,9 +81,9 @@ ENDIF()
# No headers to install
- INSTALL(FILES ${aqbanking_GLADE} DESTINATION share/gnucash/gtkbuilder)
+ INSTALL(FILES ${aqbanking_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
- INSTALL(FILES ${aqbanking_UI} DESTINATION share/gnucash/ui)
+ INSTALL(FILES ${aqbanking_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${aqbanking_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index dccaefa..536f366 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -37,11 +37,11 @@ INSTALL(TARGETS gncmod-csv-export
SET(csv_export_GLADE assistant-csv-export.glade)
-INSTALL(FILES ${csv_export_GLADE} DESTINATION share/gnucash/gtkbuilder)
+INSTALL(FILES ${csv_export_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
SET(csv_export_UI gnc-plugin-csv-export-ui.xml)
-INSTALL(FILES ${csv_export_UI} DESTINATION share/gnucash/ui)
+INSTALL(FILES ${csv_export_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${csv_export_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 0360e5d..c2a77b8 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -86,11 +86,11 @@ INSTALL(TARGETS gncmod-csv-import
SET(csv_import_GLADE assistant-csv-account-import.glade
assistant-csv-trans-import.glade)
-INSTALL(FILES ${csv_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
+INSTALL(FILES ${csv_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
SET(csv_import_UI gnc-plugin-csv-import-ui.xml)
-INSTALL(FILES ${csv_import_UI} DESTINATION share/gnucash/ui)
+INSTALL(FILES ${csv_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${csv_import_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index cea9116..0e3ba33 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -32,7 +32,7 @@ INSTALL(TARGETS gncmod-log-replay
SET(log_replay_UI gnc-plugin-log-replay-ui.xml)
-INSTALL(FILES ${log_replay_UI} DESTINATION share/gnucash/ui)
+INSTALL(FILES ${log_replay_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${log_replay_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index 905b0fa..bf858c0 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -38,7 +38,7 @@ ENDIF()
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- INSTALL(FILES ${ofx_UI} DESTINATION share/gnucash/ui)
+ INSTALL(FILES ${ofx_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${ofx_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 98cb79c..09158b1 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -72,11 +72,11 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import
SET(qif_import_GLADE assistant-qif-import.glade dialog-account-picker.glade)
-INSTALL(FILES ${qif_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
+INSTALL(FILES ${qif_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
SET(qif_import_UI gnc-plugin-qif-import-ui.xml)
-INSTALL(FILES ${qif_import_UI} DESTINATION share/gnucash/ui)
+INSTALL(FILES ${qif_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${qif_import_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/gnucash/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt
index 8028c65..1888e37 100644
--- a/gnucash/python/CMakeLists.txt
+++ b/gnucash/python/CMakeLists.txt
@@ -16,8 +16,8 @@ IF (WITH_PYTHON)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
- INSTALL(DIRECTORY pycons DESTINATION share/gnucash/python)
- INSTALL(FILES init.py DESTINATION share/gnucash/python)
+ INSTALL(DIRECTORY pycons DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python)
+ INSTALL(FILES init.py DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/python)
FILE(COPY init.py DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python)
FILE(COPY pycons DESTINATION ${CMAKE_BINARY_DIR}/share/gnucash/python)
diff --git a/gnucash/report/jqplot/CMakeLists.txt b/gnucash/report/jqplot/CMakeLists.txt
index 504bb3a..cd7fbf8 100644
--- a/gnucash/report/jqplot/CMakeLists.txt
+++ b/gnucash/report/jqplot/CMakeLists.txt
@@ -30,6 +30,6 @@ SET(gncjqplot_DATA
plugins/jqplot.trendline.js
)
-INSTALL(FILES ${gncjqplot_DATA} DESTINATION share/gnucash/jqplot)
+INSTALL(FILES ${gncjqplot_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/jqplot)
-SET_DIST_LIST(jqplot_DIST CMakeLists.txt Makefile.am jquery.js ${gncjqplot_DATA})
\ No newline at end of file
+SET_DIST_LIST(jqplot_DIST CMakeLists.txt Makefile.am jquery.js ${gncjqplot_DATA})
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index d95a57f..96845ec 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -65,11 +65,11 @@ GNC_ADD_SCHEME_TARGETS(scm-report-gnome
SET(report_gnome_GLADE dialog-custom-report.glade dialog-report.glade)
-INSTALL(FILES ${report_gnome_GLADE} DESTINATION share/gnucash/gtkbuilder)
+INSTALL(FILES ${report_gnome_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
SET(report_gnome_UI gnc-plugin-page-report-ui.xml)
-INSTALL(FILES ${report_gnome_UI} DESTINATION share/gnucash/ui)
+INSTALL(FILES ${report_gnome_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${report_gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
FILE(COPY ${report_gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 33c69af..573f1b5 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -68,7 +68,7 @@ ADD_CUSTOM_TARGET(scm-report-stylesheets ALL DEPENDS scm-report-stylesheets-1 sc
SET(stylesheets_UI gnc-plugin-stylesheets-ui.xml)
-INSTALL(FILES ${stylesheets_UI} DESTINATION share/gnucash/ui)
+INSTALL(FILES ${stylesheets_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
FILE(COPY ${stylesheets_UI}
DESTINATION ${DATADIR_BUILD}/gnucash/ui)
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 6107bf0..b2c0305 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -150,8 +150,8 @@ CONFIGURE_FILE(migratable-prefs.xml.in ${MIGRATABLE_PREFS_XML})
# This configure_file is to generate the file for autotools
CONFIGURE_FILE(migratable-prefs.xml.in migratable-prefs.xml)
-INSTALL(FILES ${MIGRATABLE_PREFS_XML} DESTINATION share/gnucash)
-INSTALL(FILES make-prefs-migration-script.xsl DESTINATION share/gnucash)
+INSTALL(FILES ${MIGRATABLE_PREFS_XML} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash)
+INSTALL(FILES make-prefs-migration-script.xsl DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash)
# And now handle scheme files
diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt
index 5ba5e9c..aa7477e 100644
--- a/libgnucash/quotes/CMakeLists.txt
+++ b/libgnucash/quotes/CMakeLists.txt
@@ -46,7 +46,7 @@ ENDFOREACH(file)
ADD_CUSTOM_TARGET(quotes-man ALL DEPENDS ${_MAN_FILES})
ADD_CUSTOM_TARGET(quotes-bin ALL DEPENDS gnc-fq-check gnc-fq-update)
-INSTALL(FILES ${_MAN_FILES} DESTINATION share/man/man1)
+INSTALL(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
INSTALL(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR})
SET_DIST_LIST(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump gnc-fq-helper.in gnc-fq-update.in
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index d9e2a1f..21139a9 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -50,7 +50,7 @@ ADD_CUSTOM_TARGET(po-gmo-build ALL DEPENDS ${BUILD_CATALOGS})
FOREACH(lingua ${ALL_LINGUAS})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo RENAME gnucash.mo DESTINATION ${CMAKE_INSTALL_DATADIR}/locale/${lingua}/LC_MESSAGES)
ENDFOREACH(lingua)
FUNCTION(READ_FILE_REMOVING_COMMENTS OUTPUT PATH)
Summary of changes:
CMakeLists.txt | 2 +-
cmake/CMakeLists.txt | 2 +-
data/pixmaps/CMakeLists.txt | 6 +-
doc/CMakeLists.txt | 6 +-
doc/examples/CMakeLists.txt | 2 +-
gnucash/CMakeLists.txt | 3 +-
gnucash/gnome-search/CMakeLists.txt | 2 +-
gnucash/gnome/CMakeLists.txt | 4 +-
gnucash/import-export/CMakeLists.txt | 2 +-
gnucash/import-export/aqb/CMakeLists.txt | 4 +-
gnucash/import-export/csv-exp/CMakeLists.txt | 4 +-
gnucash/import-export/csv-imp/CMakeLists.txt | 4 +-
gnucash/import-export/log-replay/CMakeLists.txt | 2 +-
gnucash/import-export/ofx/CMakeLists.txt | 2 +-
gnucash/import-export/qif-imp/CMakeLists.txt | 4 +-
gnucash/overrides/CMakeLists.txt | 32 ---------
gnucash/overrides/Makefile.am | 50 --------------
gnucash/overrides/gnucash-build-env.in | 88 -------------------------
gnucash/overrides/gnucash-env.in | 28 --------
gnucash/overrides/gnucash-make-guids.in | 36 ----------
gnucash/overrides/guile.in | 8 ---
gnucash/python/CMakeLists.txt | 4 +-
gnucash/report/jqplot/CMakeLists.txt | 4 +-
gnucash/report/report-gnome/CMakeLists.txt | 4 +-
gnucash/report/stylesheets/CMakeLists.txt | 2 +-
libgnucash/app-utils/CMakeLists.txt | 4 +-
libgnucash/engine/CMakeLists.txt | 10 ---
libgnucash/quotes/CMakeLists.txt | 2 +-
po/CMakeLists.txt | 2 +-
29 files changed, 35 insertions(+), 288 deletions(-)
delete mode 100644 gnucash/overrides/CMakeLists.txt
delete mode 100644 gnucash/overrides/Makefile.am
delete mode 100644 gnucash/overrides/gnucash-build-env.in
delete mode 100644 gnucash/overrides/gnucash-env.in
delete mode 100755 gnucash/overrides/gnucash-make-guids.in
delete mode 100644 gnucash/overrides/guile.in
More information about the gnucash-changes
mailing list