2001-09-05 Dave Peticolas <dave@krondo.com>

* src/Makefile.am: identify new scripts as built sources

	* configure.in: configure a gnucash-specific header directory


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5296 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-09-06 06:43:43 +00:00
parent e59c139632
commit 5b15cae1a5
3 changed files with 20 additions and 11 deletions

View File

@ -1,5 +1,9 @@
2001-09-05 Dave Peticolas <dave@krondo.com>
* src/Makefile.am: identify new scripts as built sources
* configure.in: configure a gnucash-specific header directory
* src/gnucash-run-script.in: new helper script for running gnucash
guile scripts with the right directories set up.

View File

@ -108,30 +108,33 @@ AC_ARG_ENABLE(opt-style-install,
if test x${gnc_opt_style_install} = xtrue
then
GNC_CONFIGDIR='${sysconfdir}'
GNC_LIBDIR='${libdir}'
GNC_SHAREDIR='${datadir}'
GNC_SCM_INSTALL_DIR='${datadir}/scm'
GNC_DOC_INSTALL_DIR='${datadir}/doc'
GNC_INCLUDE_DIR=${includedir}/gnucash
GNC_LIBDIR='${libdir}'
GNC_SCM_INSTALL_DIR='${datadir}/scm'
GNC_SHAREDIR='${datadir}'
else
GNC_CONFIGDIR='${sysconfdir}/gnucash'
GNC_LIBDIR='${pkglibdir}'
GNC_SHAREDIR='${pkgdatadir}'
GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm'
GNC_DOC_INSTALL_DIR='${pkgdatadir}/doc'
GNC_INCLUDE_DIR=${includedir}
GNC_LIBDIR='${pkglibdir}'
GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm'
GNC_SHAREDIR='${pkgdatadir}'
fi
GNC_ACCOUNTS_DIR=${GNC_SHAREDIR}/accounts
GNC_GLADE_DIR=${GNC_SHAREDIR}/glade
GNC_PIXMAP_DIR='${datadir}/pixmaps/gnucash'
AC_SUBST(GNC_CONFIGDIR)
AC_SUBST(GNC_LIBDIR)
AC_SUBST(GNC_SHAREDIR)
AC_SUBST(GNC_SCM_INSTALL_DIR)
AC_SUBST(GNC_DOC_INSTALL_DIR)
AC_SUBST(GNC_ACCOUNTS_DIR)
AC_SUBST(GNC_CONFIGDIR)
AC_SUBST(GNC_DOC_INSTALL_DIR)
AC_SUBST(GNC_GLADE_DIR)
AC_SUBST(GNC_INCLUDE_DIR)
AC_SUBST(GNC_LIBDIR)
AC_SUBST(GNC_PIXMAP_DIR)
AC_SUBST(GNC_SCM_INSTALL_DIR)
AC_SUBST(GNC_SHAREDIR)
# We should always see these errors...
CFLAGS="${CFLAGS} -Wall"

View File

@ -99,6 +99,7 @@ gnucash-run-script: gnucash-run-script.in Makefile
-e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:' \
-e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:'
mv $@.tmp $@
BUILT_SOURCES += gnucash-run-script
CLEANFILES += gnucash-run-script
gnucash-make-guids: gnucash-make-guids.in Makefile
@ -107,4 +108,5 @@ gnucash-make-guids: gnucash-make-guids.in Makefile
-e 's:@-GNUCASH_RUN_SCRIPT-@:${bindir}/gnucash-run-script:' \
-e 's:@-THIS_SCRIPT-@:${bindir}/$@:'
mv $@.tmp $@
BUILT_SOURCES += gnucash-make-guids
CLEANFILES += gnucash-make-guids