From b545181e5793bc10e35809a41e440204582e92d1 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Fri, 16 Feb 2007 20:45:28 +0000 Subject: [PATCH] In .: 2007-02-16 Alex Roitman * configure.in: Add HELPPATH and FONTPATH substitutions, generate new files in help/output. In help: * Makefile.am (SUBDIRS): Add subdirs. svn: r8132 --- gramps2/ChangeLog | 4 ++ gramps2/configure.in | 8 ++++ gramps2/help/ChangeLog | 1 + gramps2/help/Makefile.am | 2 + gramps2/help/output/Makeflie.am | 6 +++ gramps2/help/output/grampsfop.xconf | 58 -------------------------- gramps2/help/output/grampsfop.xconf.in | 58 ++++++++++++++++++++++++++ 7 files changed, 79 insertions(+), 58 deletions(-) create mode 100644 gramps2/help/output/Makeflie.am delete mode 100644 gramps2/help/output/grampsfop.xconf create mode 100644 gramps2/help/output/grampsfop.xconf.in diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 974d3719f..f7ce5e8f6 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2007-02-16 Alex Roitman + * configure.in: Add HELPPATH and FONTPATH substitutions, generate + new files in help/output. + 2007-02-14 Brian Matherly * src/docgen/HtmlDoc.py: fix html template loading. * src/ReportBase/_ReportDialog.py: fix html template loading. diff --git a/gramps2/configure.in b/gramps2/configure.in index e809bb336..faca1316d 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -44,6 +44,12 @@ AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollk AC_SUBST(RELEASE) AC_SUBST(VERSIONSTRING) +dnl These are needed for the full paths for the manual output +HELPPATH=$(pwd)/help/output +FONTPATH=/usr/share/fonts/truetype/freefont +AC_SUBST(HELPPATH) +AC_SUBST(FONTPATH) + dnl Add the languages which your application supports here. ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk tr" GETTEXT_PACKAGE=gramps @@ -194,6 +200,8 @@ AC_CONFIG_FILES([ po/Makefile.in m4/Makefile help/Makefile +help/output/Makefile +help/output/grampsfop.xconf Makefile gramps.spec gramps.sh diff --git a/gramps2/help/ChangeLog b/gramps2/help/ChangeLog index 0a26714a7..5664b81e0 100644 --- a/gramps2/help/ChangeLog +++ b/gramps2/help/ChangeLog @@ -1,6 +1,7 @@ 2007-02-16 Alex Roitman * help/nl: Add svn:ignore property. * various: Add stuff for generating html and pdf output. + * Makefile.am (SUBDIRS): Add subdirs. 2007-02-13 Lubo Vasko * sk/figures/*.png : Update. diff --git a/gramps2/help/Makefile.am b/gramps2/help/Makefile.am index 799aa3359..f61236255 100644 --- a/gramps2/help/Makefile.am +++ b/gramps2/help/Makefile.am @@ -1,6 +1,8 @@ # This is the help level Makefile for gramps # $Id$ +SUBDIRS = output + include $(top_srcdir)/gnome-doc-utils.make dist-hook: doc-dist-hook diff --git a/gramps2/help/output/Makeflie.am b/gramps2/help/output/Makeflie.am new file mode 100644 index 000000000..b58e5a6e8 --- /dev/null +++ b/gramps2/help/output/Makeflie.am @@ -0,0 +1,6 @@ +# This is the help/output level Makefile for gramps +# $Id$ + +html: /bin/true && "This is a placeholder" + +pdf: /bin/true && "This is a placeholder" diff --git a/gramps2/help/output/grampsfop.xconf b/gramps2/help/output/grampsfop.xconf deleted file mode 100644 index 579c345c0..000000000 --- a/gramps2/help/output/grampsfop.xconf +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - 72 - - 72 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gramps2/help/output/grampsfop.xconf.in b/gramps2/help/output/grampsfop.xconf.in new file mode 100644 index 000000000..cf93b1115 --- /dev/null +++ b/gramps2/help/output/grampsfop.xconf.in @@ -0,0 +1,58 @@ + + + + + + 72 + + 72 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file