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

Use one common base directory to store all scheme files and modules

Browse Source 
This makes it easier for humans to locate a file after
installation and simplifies the build system.
This commit is contained in:
Geert Janssens 2014-10-31 10:26:03 +01:00
parent be0e3581c2
commit c9bfaa8bb3
23 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app-utils/Makefile.am
View File

@ -136,7 +136,7 @@ libgncmod_app_utils_python_la_LIBADD = \
libgncmod-app-utils.la libgncmod-app-utils.la
endif endif
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = \ gncscmmod_DATA = \
gettext.scm \ gettext.scm \
app-utils.scm app-utils.scm
@ -220,7 +220,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@ gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@

4
src/bin/environment.in
View File

@ -49,8 +49,8 @@ GUILE_WARN_DEPRECATED=no
# Tell Guile where to find GnuCash specific guile modules # Tell Guile where to find GnuCash specific guile modules
# GUILE_LIBS can be used to override the path to Guile's own modules # GUILE_LIBS can be used to override the path to Guile's own modules
# GUILE_LIBS= # GUILE_LIBS=
GUILE_LOAD_PATH={GNC_DATA}/guile-modules;{GNC_DATA}/scm;{GUILE_LIBS};{GUILE_LOAD_PATH} GUILE_LOAD_PATH={GNC_DATA}/scm;{GUILE_LIBS};{GUILE_LOAD_PATH}
GUILE_LOAD_COMPILED_PATH={GNC_DATA}/guile-modules/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GNC_DATA}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_LIBS};{GUILE_LOAD_PATH} GUILE_LOAD_COMPILED_PATH={GNC_DATA}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_LIBS};{GUILE_LOAD_PATH}
# Tell Guile where to find GnuCash specific shared libraries # Tell Guile where to find GnuCash specific shared libraries
GNC_LIBRARY_PATH={SYS_LIB} GNC_LIBRARY_PATH={SYS_LIB}

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

@ -31,7 +31,6 @@ CLEANFILES = guile
gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
rm -f $@.tmp rm -f $@.tmp
sed < $< > $@.tmp \ sed < $< > $@.tmp \
-e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
-e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \ -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
-e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \ -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
-e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \ -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \

1
src/bin/overrides/gnucash-env.in
View File

@ -6,7 +6,6 @@
GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}" GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@" EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}" GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"

4
src/business/business-gnome/Makefile.am
View File

@ -83,7 +83,7 @@ libgncmod_business_gnome_la_LIBADD = \
${GLIB_LIBS} \ ${GLIB_LIBS} \
${EFENCE_LIBS} ${EFENCE_LIBS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = business-gnome.scm gncscmmod_DATA = business-gnome.scm
EXTRA_DIST = \ EXTRA_DIST = \
@ -136,7 +136,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif

6
src/core-utils/Makefile.am
View File

@ -67,7 +67,7 @@ AM_CPPFLAGS = \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/src -I${top_srcdir}/src
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = core-utils.scm gncscmmod_DATA = core-utils.scm
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
@ -122,7 +122,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif
@ -135,7 +135,7 @@ clean-local:
CLEANFILES = $(BUILT_SOURCES) .scm-links CLEANFILES = $(BUILT_SOURCES) .scm-links
MAINTAINERCLEANFILES = swig-core-utils-guile.c swig-core-utils-python.c MAINTAINERCLEANFILES = swig-core-utils-guile.c swig-core-utils-python.c
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\" AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\" -DGNC_SCM_INSTALL_DIR="\"${GNC_SCM_INSTALL_DIR}\""
gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status Makefile gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status Makefile
rm -f $@.tmp rm -f $@.tmp

6
src/core-utils/gnc-path.c
View File

@ -149,7 +149,7 @@ gchar *gnc_path_get_accountsdir()
} }
/** Returns the file path to the report directory, usually /** Returns the file path to the report directory, usually
* "$prefix/share/gnucash/guile-modules/gnucash/report". * "$prefix/share/gnucash/scm/gnucash/report".
* *
* @returns A newly allocated string. */ * @returns A newly allocated string. */
gchar *gnc_path_get_reportdir() gchar *gnc_path_get_reportdir()
@ -163,7 +163,7 @@ gchar *gnc_path_get_reportdir()
else else
{ {
gchar *pkgdatadir = gnc_path_get_pkgdatadir (); gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
result = g_build_filename (pkgdatadir, "guile-modules", result = g_build_filename (GNC_SCM_INSTALL_DIR,
"gnucash", "report", (char*)NULL); "gnucash", "report", (char*)NULL);
g_free (pkgdatadir); g_free (pkgdatadir);
} }
@ -173,7 +173,7 @@ gchar *gnc_path_get_reportdir()
/** Returns the file path to the standard /** Returns the file path to the standard
* reports, usually * reports, usually
* "$prefix/share/gnucash/guile-modules/gnucash/report/standard-reports". * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
* *
* @returns A newly allocated string. */ * @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir() gchar *gnc_path_get_stdreportsdir()

4
src/core-utils/gnc-path.h
View File

@ -87,14 +87,14 @@ gchar *gnc_path_get_localedir(void);
gchar *gnc_path_get_accountsdir(void); gchar *gnc_path_get_accountsdir(void);
/** Returns the file path to the report directory, usually /** Returns the file path to the report directory, usually
* "$prefix/share/gnucash/guile-modules/gnucash/report". * "$prefix/share/gnucash/scm/gnucash/report".
* *
* @returns A newly allocated string. */ * @returns A newly allocated string. */
gchar *gnc_path_get_reportdir(void); gchar *gnc_path_get_reportdir(void);
/** Returns the file path to the standard /** Returns the file path to the standard
* reports, usually * reports, usually
* "$prefix/share/gnucash/guile-modules/gnucash/report/standard-reports". * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
* *
* @returns A newly allocated string. */ * @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir(void); gchar *gnc_path_get_stdreportsdir(void);

4
src/engine/Makefile.am
View File

@ -143,7 +143,7 @@ libgncmod_engine_la_LIBADD = \
${GLIB_LIBS} \ ${GLIB_LIBS} \
${top_builddir}/lib/libc/libc-missing.la ${top_builddir}/lib/libc/libc-missing.la
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = engine.scm \ gncscmmod_DATA = engine.scm \
business-core.scm business-core.scm
@ -202,7 +202,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@ gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@

4
src/gnc-module/Makefile.am
View File

@ -19,7 +19,7 @@ libgnc_module_la_LIBADD = \
${GLIB_LIBS} \ ${GLIB_LIBS} \
${GUILE_LIBS} ${GUILE_LIBS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = gnc-module.scm gncscmmod_DATA = gnc-module.scm
gncincludedir = ${GNC_INCLUDE_DIR} gncincludedir = ${GNC_INCLUDE_DIR}
@ -75,7 +75,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif

4
src/gnome-utils/Makefile.am
View File

@ -239,7 +239,7 @@ endif
endif endif
endif endif
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = gnome-utils.scm gncscmmod_DATA = gnome-utils.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR} gncscmdir = ${GNC_SCM_INSTALL_DIR}
@ -289,7 +289,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@ gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@

4
src/import-export/qif-imp/Makefile.am
View File

@ -28,7 +28,7 @@ libgncmod_qif_import_la_LIBADD = \
${GLIB_LIBS} ${GLIB_LIBS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/import-export gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/import-export
gncscmmod_DATA = qif-import.scm gncscmmod_DATA = qif-import.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR}/qif-import gncscmdir = ${GNC_SCM_INSTALL_DIR}/qif-import
@ -114,7 +114,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import

6
src/report/business-reports/Makefile.am
View File

@ -1,4 +1,4 @@
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
gncscmmod_DATA = \ gncscmmod_DATA = \
aging.scm \ aging.scm \
customer-summary.scm \ customer-summary.scm \
@ -16,7 +16,7 @@ gncscmmod_DATA = \
# Note: list these files separately because they can't be compiled by guile2 # Note: list these files separately because they can't be compiled by guile2
# templates are a mixture of scheme and hmtl # templates are a mixture of scheme and hmtl
# css files are not scheme at all # css files are not scheme at all
gncscmtpldir = ${GNC_SHAREDIR}/guile-modules/gnucash/report gncscmtpldir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
gncscmtpl_DATA = \ gncscmtpl_DATA = \
taxinvoice.eguile.scm \ taxinvoice.eguile.scm \
taxinvoice.css \ taxinvoice.css \
@ -69,7 +69,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif

8
src/report/locale-specific/us/Makefile.am
View File

@ -21,10 +21,10 @@ AM_CPPFLAGS = \
${GUILE_CFLAGS} ${GLIB_CFLAGS} ${GUILE_CFLAGS} ${GLIB_CFLAGS}
## This is unused and therefore no longer installed and/or loaded ## This is unused and therefore no longer installed and/or loaded
gncscmrptdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/locale-specific
gncscmrpt_DATA = us.scm de_DE.scm gncscmrpt_DATA = us.scm de_DE.scm
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = taxtxf.scm taxtxf-de_DE.scm gncscmmod_DATA = taxtxf.scm taxtxf-de_DE.scm
if GNUCASH_SEPARATE_BUILDDIR if GNUCASH_SEPARATE_BUILDDIR
@ -78,10 +78,10 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmrptcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go) gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
endif endif

4
src/report/report-gnome/Makefile.am
View File

@ -62,7 +62,7 @@ endif
endif endif
endif endif
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
gncscmmod_DATA = report-gnome.scm gncscmmod_DATA = report-gnome.scm
noinst_DATA = .scm-links noinst_DATA = .scm-links
@ -126,7 +126,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif

8
src/report/report-system/Makefile.am
View File

@ -67,14 +67,14 @@ gncscm_DATA = \
report-utilities.scm \ report-utilities.scm \
report.scm report.scm
gncmodscmdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/report-system gncmodscmdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/report-system
gncmodscm_DATA = \ gncmodscm_DATA = \
collectors.scm \ collectors.scm \
list-extras.scm \ list-extras.scm \
report-collectors.scm report-collectors.scm
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \ gncscmmod_DATA = \
report-system.scm \ report-system.scm \
eguile-gnc.scm \ eguile-gnc.scm \
@ -131,10 +131,10 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncmodscmcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system gncmodscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system
gncmodscmcache_DATA = $(gncmodscm_DATA:.scm=.go) gncmodscmcache_DATA = $(gncmodscm_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@ gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@

4
src/report/report-system/html-document.scm
View File

@ -155,8 +155,8 @@
(begin (begin
;;This is the only place where <html> appears ;;This is the only place where <html> appears
;;with the exception of 2 reports: ;;with the exception of 2 reports:
;;./share/gnucash/guile-modules/gnucash/report/taxinvoice.eguile.scm:<html> ;;./share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm:<html>
;;./share/gnucash/guile-modules/gnucash/report/balsheet-eg.eguile.scm:<html> ;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>
;; Validate against XHTML 1.0 Transitional ;; Validate against XHTML 1.0 Transitional
(push "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">") (push "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")

8
src/report/standard-reports/Makefile.am
View File

@ -18,11 +18,11 @@ AM_CPPFLAGS = \
${GUILE_CFLAGS} \ ${GUILE_CFLAGS} \
${GLIB_CFLAGS} ${GLIB_CFLAGS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \ gncscmmod_DATA = \
standard-reports.scm standard-reports.scm
gncscmrptdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/standard-reports
gncscmrpt_DATA = \ gncscmrpt_DATA = \
account-piecharts.scm \ account-piecharts.scm \
account-summary.scm \ account-summary.scm \
@ -99,10 +99,10 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmrptcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go) gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
endif endif

4
src/report/stylesheets/Makefile.am
View File

@ -33,7 +33,7 @@ AM_CPPFLAGS = \
${GLIB_CFLAGS} \ ${GLIB_CFLAGS} \
${GTK_CFLAGS} ${GTK_CFLAGS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \ gncscmmod_DATA = \
stylesheets.scm \ stylesheets.scm \
stylesheet-plain.scm \ stylesheet-plain.scm \
@ -86,7 +86,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif

4
src/report/utility-reports/Makefile.am
View File

@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/gnc-module \
${GUILE_CFLAGS} ${GLIB_CFLAGS} ${GUILE_CFLAGS} ${GLIB_CFLAGS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \ gncscmmod_DATA = \
hello-world.scm \ hello-world.scm \
utility-reports.scm \ utility-reports.scm \
@ -71,7 +71,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif

4
src/scm/Makefile.am
View File

@ -2,7 +2,7 @@
SUBDIRS = gnumeric SUBDIRS = gnumeric
gncscmdir = ${GNC_SCM_INSTALL_DIR} gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = main.scm price-quotes.scm printf.scm gncscmmod_DATA = main.scm price-quotes.scm printf.scm
@ -53,7 +53,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@ gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@

4
src/tax/us/Makefile.am
View File

@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/gnc-module \
${GLIB_CFLAGS} ${GUILE_CFLAGS} ${GLIB_CFLAGS} ${GUILE_CFLAGS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/tax gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/tax
gncscmmod_DATA = us.scm de_DE.scm gncscmmod_DATA = us.scm de_DE.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR} gncscmdir = ${GNC_SCM_INSTALL_DIR}
@ -62,7 +62,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@ gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@

4
src/test-core/Makefile.am
View File

@ -78,7 +78,7 @@ _unittest_support_la_LIBADD = \
endif endif
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = unittest-support.scm gncscmmod_DATA = unittest-support.scm
SCM_FILES = $(gncscmmod_DATA) SCM_FILES = $(gncscmmod_DATA)
@ -107,7 +107,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $< $(GUILD) compile -o $@ $<
gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go) gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif endif