[Gnucash-changes] r14171 - gnucash-docs/trunk - update fix build
for release
Chris Lyttle
wilddev at cvs.gnucash.org
Wed May 24 00:17:57 EDT 2006
Author: wilddev
Date: 2006-05-24 00:17:56 -0400 (Wed, 24 May 2006)
New Revision: 14171
Trac: http://svn.gnucash.org/trac/changeset/14171
Modified:
gnucash-docs/trunk/ChangeLog
gnucash-docs/trunk/Makefile.am
gnucash-docs/trunk/configure.in
gnucash-docs/trunk/guide/Makefile.am
gnucash-docs/trunk/xmldocs.make
Log:
update fix build for release
Modified: gnucash-docs/trunk/ChangeLog
===================================================================
--- gnucash-docs/trunk/ChangeLog 2006-05-24 03:55:35 UTC (rev 14170)
+++ gnucash-docs/trunk/ChangeLog 2006-05-24 04:17:56 UTC (rev 14171)
@@ -1,5 +1,20 @@
+2006-05-23 Chris Lyttle <chris at wilddev.net>
+
+ * xmldocs.make: fix make html so it copies pictures into the html
+ directory. The generated html will be left in the build directory.
+
2006-05-08 Chris Lyttle <chris at wilddev.net>
+
+ * configure.in: remove checks for anything to do with using
+ the doc-tools directory. Just check for scrollkeeper and
+ xsltproc. Remove de_DE guide from build as its not updated.
+ * Makefile.am: remove doc-tools directory
+ * xmldocs.make: remove making html from all target and make
+ new target html. Now make html will be the only thing to generate
+ html docs.
+2006-05-08 Chris Lyttle <chris at wilddev.net>
+
* 'guide/C/ch_invest.xml': fixup
2006-05-06 Chris Lyttle <chris at wilddev.net>
Modified: gnucash-docs/trunk/Makefile.am
===================================================================
--- gnucash-docs/trunk/Makefile.am 2006-05-24 03:55:35 UTC (rev 14170)
+++ gnucash-docs/trunk/Makefile.am 2006-05-24 04:17:56 UTC (rev 14171)
@@ -1,6 +1,5 @@
SUBDIRS = help \
- guide \
- doc-tools
+ guide
EXTRA_DIST = gnucash-docs.spec \
COPYING-DOCS \
Modified: gnucash-docs/trunk/configure.in
===================================================================
--- gnucash-docs/trunk/configure.in 2006-05-24 03:55:35 UTC (rev 14170)
+++ gnucash-docs/trunk/configure.in 2006-05-24 04:17:56 UTC (rev 14171)
@@ -13,42 +13,7 @@
SCROLLKEEPER_BUILD_REQUIRED=0.3.4
AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
-dnl ==========================================================================
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-
dnl ====================================
-dnl = Begin checks for typedefs, structures, and compiler characteristics.
-dnl ====================================
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-dnl ====================================
-dnl = End checks for typedefs, structures, and compiler characteristics.
-dnl ====================================
-
-dnl ====================================
-dnl = Begin checks for library functions.
-dnl ====================================
-AC_FUNC_ALLOCA
-AC_FUNC_MMAP
-AC_CHECK_FUNCS(getcwd getwd putenv strdup)
-dnl ====================================
-dnl = End checks for library functions.
-dnl ====================================
-
-dnl ====================================
dnl = Begin tests for scrollkeeper
dnl ====================================
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
@@ -59,9 +24,7 @@
dnl = End tests for scrollkeeper
dnl ====================================
-AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(gnucash-docs,1.9.0)
-AM_PROG_LIBTOOL
dnl
dnl Check for xsltproc
@@ -71,115 +34,11 @@
AC_MSG_ERROR([xsltproc not found])
fi
-### --------------------------------------------------------------------------
-### Check for perl
-
-# Check for perl, force version 5
-AC_ARG_WITH(perl,
- [ --with-perl=FILE which perl executable to use ],
- PERL="${with_perl}")
-
-# If the user didn't specify a perl, then go fetch.
-if test x"$PERL" = x;
-then
- AC_PATH_PROG(PERL, perl)
-fi
-
-# Make sure Perl was found
-if test x"$PERL" = x || test x"$PERL" = xno ; then
- AC_MSG_ERROR([Cannot find Perl. Try using the --with-perl flag.])
-fi
-
-# Make sure it's version 5 or later
-if "$PERL" -e 'exit 1 if $] < 5.0'; then
- :
-else
- AC_MSG_ERROR([Found ${PERL} reports version ]
- [`${PERL} -e 'print $]'`, need version 5.*])
-fi
-AC_SUBST(PERL)
-
-# Now check for perl headers
-# This appears to be what Perl's
-# ExtUtils::MakeMaker module does, so
-# I'm reasonably sure it's correct.
-# PERLINCL="/usr/lib/perl5/i386-linux/5.00404"
-#
-PERLINCL=`$PERL -MConfig -e 'print $Config{"archlibexp"}'`
-AC_ARG_WITH( perl-includes,
- [ --with-perl-includes=DIR specify where to look for perl includes],
- PERLINCL="$with_perl_includes" )
-AC_SUBST(PERLINCL)
-
-### --------------------------------------------------------------------------
-### Berkeley db
-
-AC_ARG_ENABLE(prefer-db1,
- [ --enable-prefer-db1 Prefer Berkeley DB
-1.x],[prefer_db1="$enableval"],[prefer_db1=yes])
-
-DB_LIBS=
-AC_CHECK_FUNC(dbopen, [],
-if test "$prefer_db1" = "yes"; then
- AC_CHECK_LIB(db1, dbopen, DB_LIBS="-ldb1",
- AC_CHECK_LIB(db, dbopen, DB_LIBS="-ldb",
- AC_CHECK_LIB(db-3, __db185_open, DB_LIBS="-ldb-3",
- AC_CHECK_LIB(db-4.0, __db185_open, DB_LIBS="-ldb-4.0",
- AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1",
- AC_CHECK_LIB(db-4.2, __db185_open, DB_LIBS="-ldb-4.2",
- AC_CHECK_LIB(db, __db185_open, DB_LIBS="-ldb",
- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
- )
- )
- )
- )
- )
- )
- )
-else
- AC_CHECK_LIB(db, dbopen, DB_LIBS="-ldb",
- AC_CHECK_LIB(db1, dbopen, DB_LIBS="-ldb1",
- AC_CHECK_LIB(db-3, __db185_open, DB_LIBS="-ldb-3",
- AC_CHECK_LIB(db-4.0, __db185_open, DB_LIBS="-ldb-4.0",
- AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1",
- AC_CHECK_LIB(db-4.2, __db185_open, DB_LIBS="-ldb-4.2",
- AC_CHECK_LIB(db, __db185_open, DB_LIBS="-ldb",
- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
- )
- )
- )
- )
- )
- )
- )
-fi
-)
-
-dnl look for db headers
-if test "$prefer_db1" = "yes"; then
- AC_CHECK_HEADERS(db_185.h db1/db.h db4/db_185.h)
- if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h$ac_cv_header_db4_db_185_h" = nonono; then
- AC_MSG_ERROR([Berkeley db library required for GnuCash])
- fi
- AC_DEFINE([PREFER_DB1], [], [The db1 database library])
-else
- AC_CHECK_HEADERS(db.h db_185.h db1/db.h db4/db_185.h)
-
- if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h$ac_cv_header_db4_db_185_h" = nononono;
-then
- AC_MSG_ERROR([Berkeley db library required for GnuCash])
- fi
-fi
-
-AC_SUBST(DB_LIBS)
-
AC_OUTPUT(
gnucash-docs.spec
-doc-tools/Makefile
help/Makefile
help/C/Makefile
help/de_DE/Makefile
guide/Makefile
guide/C/Makefile
-guide/de_DE/Makefile
Makefile)
Modified: gnucash-docs/trunk/guide/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/Makefile.am 2006-05-24 03:55:35 UTC (rev 14170)
+++ gnucash-docs/trunk/guide/Makefile.am 2006-05-24 04:17:56 UTC (rev 14171)
@@ -1 +1 @@
-SUBDIRS = C de_DE
+SUBDIRS = C
Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make 2006-05-24 03:55:35 UTC (rev 14170)
+++ gnucash-docs/trunk/xmldocs.make 2006-05-24 04:17:56 UTC (rev 14171)
@@ -56,13 +56,28 @@
$(top_srcdir)/xsl/general-customization.xsl $(srcdir)/$$file; \
done
+copy-pics:
+ $(mkinstalldirs) $(docname)/$(figdir); \
+ for file in $(srcdir)/$(figdir)/*.png; do \
+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+ $(INSTALL_DATA) $$file $(srcdir)/$(docname)/$(figdir)/$$basefile; \
+ done
+
+copy-style:
+ $(mkinstalldirs) $(docname)/stylesheet; \
+ for file in $(styledir)/*.png; do \
+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+ $(INSTALL_DATA) $$file $(srcdir)/$(docname)/stylesheet/$$basefile; \
+ done
+
EXTRA_DIST = $(xml_files) $(omffile)
CLEANFILES = omf_timestamp $(docname)/*.html
# If the following file is in a subdir (like help/) you need to add that to the path
include $(top_srcdir)/omf.make
-all: omf convert-html
+html: all convert-html copy-pics copy-style
+all: omf
#$(docname).xml: $(entities)
# -ourdir=`pwd`; \
@@ -83,32 +98,20 @@
for file in $(xml_files); do \
cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
done
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(docname); \
- for file in $(docname)/*.html; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(docname)/$$basefile; \
- done
if test "$(figdir)"; then \
$(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(docname)/$(figdir); \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(docname)/$(figdir)/$$basefile; \
done \
fi
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(docname)/stylesheet; \
- for file in $(styledir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(docname)/stylesheet/$$basefile; \
- done
+
install-data-hook: install-data-hook-omf
uninstall-local: uninstall-local-doc uninstall-local-omf
uninstall-local-doc:
- -rm -f $(DESTDIR)$(docdir)/help-search-index.db
-if test "$(figdir)"; then \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
More information about the gnucash-changes
mailing list