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

fix various configure problems

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1360 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-10-27 06:36:35 +00:00
parent 32c55f8cba
commit 1d9b2086b8
5 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -143,9 +143,6 @@ install:
$(INSTALL_DATA) TODO ${GNC_DOCDIR}
$(INSTALL_DATA) CHANGES ${GNC_DOCDIR}
@mkdir -p ${GNC_DOCDIR}/data
$(INSTALL_DATA) data/*.xac ${GNC_DOCDIR}/data
# @mkdir -p $(prefix)/toolbar
# $(INSTALL_DATA) toolbar/*.xpm $(prefix)/toolbar
@ -165,6 +162,9 @@ install:
${INSTALL_DATA} $$file ${GNC_SHAREDIR}/scm/$$dest; \
done
@mkdir -p ${GNC_SHAREDIR}/data
$(INSTALL_DATA) data/*.xac ${GNC_SHAREDIR}/data
@mkdir -p ${GNC_SHAREDIR}/Docs
$(INSTALL_DATA) Docs/*.html ${GNC_SHAREDIR}/Docs
# $(INSTALL_DATA) Docs/*.phtml ${GNC_SHAREDIR}/Docs

7
configure vendored
View File

@ -2469,6 +2469,11 @@ fi
#############################################################
### Set up the install style and all the default paths... ###
# some confusion due to FSSTND stuff --
# the readme's and miscellaneous docs are in /usr/doc (or equivalent)
# the online help system is in /usr/share/gnucash/Doc and various subdirs
# the parsed-html report supsystem is in /usr/share/gnucash/Reports
if test ${OPT_STYLE_INSTALL} = 1
then
GNC_DOCDIR=${prefix}/doc
@ -2499,6 +2504,8 @@ fi
#
GNC_STARTUP_FILE=`eval echo ${GNC_SHAREDIR}/scm/startup.scm`
GNC_DOC_DIR_DEFAULT=`eval echo ${GNC_DOCDIR}`
GNC_HTML_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Docs`
GNC_REPORT_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Reports`
GNC_SHARE_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}`
GNC_CONFIG_DIR_DEFAULT=`eval echo ${GNC_CONFIGDIR}`

13
configure.in
View File

@ -185,20 +185,27 @@ AC_SUBST(MOTIF_LIBS)
#############################################################
### Set up the install style and all the default paths... ###
# some confusion due to FSSTND stuff --
# the readme's and miscellaneous docs are in /usr/doc (or equivalent)
# the online help system is in /usr/share/gnucash/Doc and various subdirs
# the parsed-html report supsystem is in /usr/share/gnucash/Reports
if test ${OPT_STYLE_INSTALL} = 1
then
GNC_DOCDIR=${prefix}/doc
GNC_BINDIR=${prefix}/bin
GNC_CONFIGDIR=${sysconfdir}
GNC_SHAREDIR=${datadir}
GNC_STARTUP_FILE=`eval echo ${datadir}/startup.scm`
else
GNC_DOCDIR=${prefix}/doc/gnucash
GNC_BINDIR=${prefix}/bin
GNC_CONFIGDIR=${sysconfdir}/gnucash
GNC_SHAREDIR=${datadir}/gnucash
GNC_STARTUP_FILE=`eval echo ${datadir}/startup.scm`
GNC_STARTUP_FILE=`eval echo ${datadir}/scm/startup.scm`
fi
AC_SUBST(GNC_DOCDIR)
AC_SUBST(GNC_BINDIR)
AC_SUBST(GNC_CONFIGDIR)
@ -213,8 +220,10 @@ AC_SUBST(GNC_SHAREDIR)
# that before substituting into those source files. I wish I knew how
# to force a recursive expansion...
#
GNC_STARTUP_FILE=`eval echo ${GNC_SHAREDIR}/scm/startup.scm`
# GNC_STARTUP_FILE=`eval echo ${GNC_SHAREDIR}/scm/startup.scm`
GNC_DOC_DIR_DEFAULT=`eval echo ${GNC_DOCDIR}`
GNC_HTML_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Docs`
GNC_REPORT_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Reports`
GNC_SHARE_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}`
GNC_CONFIG_DIR_DEFAULT=`eval echo ${GNC_CONFIGDIR}`

9
src/scm/startup.scm
View File

@ -16,9 +16,10 @@
(primitive-load boot-file))
;; Automatically generated defaults...
(define gnc:_config-dir-default_ "/usr/etc/gnucash")
(define gnc:_share-dir-default_ "/usr/share/gnucash")
(define gnc:_doc-dir-default_ "/usr/doc/gnucash")
(define gnc:_config-dir-default_ "/usr/local/etc/gnucash")
(define gnc:_share-dir-default_ "/usr/local/share/gnucash")
(define gnc:_doc-dir-default_ "/usr/local/share/gnucash/Docs
/usr/local/share/gnucash/Reports")
(define gnc:*command-line-files* #f)
@ -353,7 +354,7 @@ variable is modified. The symbol element default will expand to the default dir
(define gnc:*doc-path*
(gnc:make-config-var
"A list of strings indicating where to look for documentation files
"A list of strings indicating where to look for html and parsed-html files
Any path element enclosed in parentheses will automatically be
expanded to that directory and all its subdirectories whenever this
variable is modified. The symbol element default will expand to the

5
src/scm/startup.scm.in
View File

@ -18,7 +18,8 @@
;; Automatically generated defaults...
(define gnc:_config-dir-default_ "@GNC_CONFIG_DIR_DEFAULT@")
(define gnc:_share-dir-default_ "@GNC_SHARE_DIR_DEFAULT@")
(define gnc:_doc-dir-default_ "@GNC_DOC_DIR_DEFAULT@")
(define gnc:_doc-dir-default_ "@GNC_SHARE_DIR_DEFAULT@/Docs
@GNC_SHARE_DIR_DEFAULT@/Reports")
(define gnc:*command-line-files* #f)
@ -353,7 +354,7 @@ variable is modified. The symbol element default will expand to the default dir
(define gnc:*doc-path*
(gnc:make-config-var
"A list of strings indicating where to look for documentation files
"A list of strings indicating where to look for html and parsed-html files
Any path element enclosed in parentheses will automatically be
expanded to that directory and all its subdirectories whenever this
variable is modified. The symbol element default will expand to the