[Gnucash-changes] r14329 - gnucash-docs/trunk - fixes to make
distcheck work again
Chris Lyttle
wilddev at cvs.gnucash.org
Sun Jun 4 22:56:24 EDT 2006
Author: wilddev
Date: 2006-06-04 22:56:23 -0400 (Sun, 04 Jun 2006)
New Revision: 14329
Trac: http://svn.gnucash.org/trac/changeset/14329
Modified:
gnucash-docs/trunk/ChangeLog
gnucash-docs/trunk/Makefile.am
gnucash-docs/trunk/configure.in
gnucash-docs/trunk/guide/C/Makefile.am
gnucash-docs/trunk/guide/de_DE/Makefile.am
gnucash-docs/trunk/help/C/Makefile.am
gnucash-docs/trunk/help/de_DE/Makefile.am
gnucash-docs/trunk/omf.make
gnucash-docs/trunk/xmldocs.make
Log:
fixes to make distcheck work again
Modified: gnucash-docs/trunk/ChangeLog
===================================================================
--- gnucash-docs/trunk/ChangeLog 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/ChangeLog 2006-06-05 02:56:23 UTC (rev 14329)
@@ -1,3 +1,14 @@
+2006-06-04 Chris Lyttle <chris at wilddev.net>
+
+ * xmldocs.make: fixups to make distcheck work
+ * configure.in: add --disable-scrollkeeper switch
+ * help/de_DE/Makefile.am: add DISTCLEANFILES
+ * help/C/Makefile.am: add DISTCLEANFILES
+ * guide/de_DE/Makefile.am: add DISTCLEANFILES
+ * guide/C/Makefile.am: add DISTCLEANFILES
+ * omf.make: make scrollkeeper run conditional
+ * Makefile.am: add --disable-scrollkeeper switch
+
2006-05-28 Chris Lyttle <chris at wilddev.net>
* xmldocs.make: fix uninstall. note that distcheck fails still
Modified: gnucash-docs/trunk/Makefile.am
===================================================================
--- gnucash-docs/trunk/Makefile.am 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/Makefile.am 2006-06-05 02:56:23 UTC (rev 14329)
@@ -8,3 +8,8 @@
stylesheet \
xsl \
HACKING
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+
+distuninstallcheck_listfiles = \
+find -regex '.*/var/scrollkeeper/.*' -prune -or -type f -print
Modified: gnucash-docs/trunk/configure.in
===================================================================
--- gnucash-docs/trunk/configure.in 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/configure.in 2006-06-05 02:56:23 UTC (rev 14329)
@@ -20,6 +20,11 @@
if test x$SCROLLKEEPER_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net)
fi
+AC_ARG_ENABLE([scrollkeeper],
+ [AC_HELP_STRING([--disable-scrollkeeper],
+ [do not make updates to the scrollkeeper database])],,
+ enable_scrollkeeper=yes)
+AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
dnl ====================================
dnl = End tests for scrollkeeper
dnl ====================================
Modified: gnucash-docs/trunk/guide/C/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/C/Makefile.am 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/guide/C/Makefile.am 2006-06-05 02:56:23 UTC (rev 14329)
@@ -25,3 +25,4 @@
appendixc.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
+DISTCLEANFILES = gnucash-guide-C.omf.out
Modified: gnucash-docs/trunk/guide/de_DE/Makefile.am
===================================================================
--- gnucash-docs/trunk/guide/de_DE/Makefile.am 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/guide/de_DE/Makefile.am 2006-06-05 02:56:23 UTC (rev 14329)
@@ -7,3 +7,4 @@
ch_oview.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
+DISTCLEANFILES = gnucash-guide-de_DE.omf.out
Modified: gnucash-docs/trunk/help/C/Makefile.am
===================================================================
--- gnucash-docs/trunk/help/C/Makefile.am 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/help/C/Makefile.am 2006-06-05 02:56:23 UTC (rev 14329)
@@ -14,3 +14,4 @@
custom.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
+DISTCLEANFILES = gnucash-help-C.omf.out
Modified: gnucash-docs/trunk/help/de_DE/Makefile.am
===================================================================
--- gnucash-docs/trunk/help/de_DE/Makefile.am 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/help/de_DE/Makefile.am 2006-06-05 02:56:23 UTC (rev 14329)
@@ -10,3 +10,4 @@
txf-categories.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
+DISTCLEANFILES = gnucash-help-de_DE.omf.out
Modified: gnucash-docs/trunk/omf.make
===================================================================
--- gnucash-docs/trunk/omf.make 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/omf.make 2006-06-05 02:56:23 UTC (rev 14329)
@@ -38,16 +38,19 @@
touch omf_timestamp
install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ $(mkinstalldirs) "$(DESTDIR)$(omf_dest_dir)"
for file in $(omffile); do \
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ $(INSTALL_DATA) "$$file.out" "$(DESTDIR)$(omf_dest_dir)/$$file"; \
done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ @if test "x$(_ENABLE_SK)" = "xtrue"; then \
+ scrollkeeper-update -p "$(scrollkeeper_localstate_dir)" -o "$(DESTDIR)$(omf_dest_dir)"; \
+ fi;
uninstall-local-omf:
- -for file in $(srcdir)/*.omf; do \
- basefile=`basename $$file`; \
- rm -f $(omf_dest_dir)/$$basefile; \
+ @if test "x$(_ENABLE_SK)" == "xtrue"; then \
+ scrollkeeper-uninstall -p "$(scrollkeeper_localstate_dir)" "$(DESTDIR)$(omf_dest_dir)/$$file"; \
+ fi; \
+ for file in $(srcdir)/*.omf; do \
+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+ rm -f "$(DESTDIR)$(omf_dest_dir)/$$basefile"; \
done
- -rmdir $(omf_dest_dir)
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make 2006-06-05 02:44:25 UTC (rev 14328)
+++ gnucash-docs/trunk/xmldocs.make 2006-06-05 02:56:23 UTC (rev 14329)
@@ -50,24 +50,24 @@
# Convert xml to html with xsltproc
# xsltproc -o outputdir/ /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl filename.xml
convert-html:
- $(mkinstalldirs) $(docname); \
+ $(mkinstalldirs) "$(docname)"; \
for file in $(docname).xml; do \
- xsltproc -o $(docname)/ --param use.id.as.filename 1 \
- $(top_srcdir)/xsl/general-customization.xsl $(srcdir)/$$file; \
+ xsltproc -o "$(docname)/" --param use.id.as.filename "1" \
+ "$(top_srcdir)/xsl/general-customization.xsl" "$(srcdir)/$$file"; \
done
copy-pics:
- $(mkinstalldirs) $(docname)/$(figdir); \
+ $(mkinstalldirs) "$(docname)/$(figdir)"; \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(srcdir)/$(docname)/$(figdir)/$$basefile; \
+ $(INSTALL_DATA) "$$file" "$(srcdir)/$(docname)/$(figdir)/$$basefile"; \
done
copy-style:
- $(mkinstalldirs) $(docname)/stylesheet; \
+ $(mkinstalldirs) "$(docname)/stylesheet"; \
for file in $(styledir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(srcdir)/$(docname)/stylesheet/$$basefile; \
+ $(INSTALL_DATA) "$$file" "$(srcdir)/$(docname)/stylesheet/$$basefile"; \
done
EXTRA_DIST = $(xml_files) $(omffile)
@@ -86,25 +86,25 @@
app-dist-hook:
if test "$(figdir)"; then \
- $(mkinstalldirs) $(distdir)/$(figdir); \
+ $(mkinstalldirs) "$(distdir)/$(figdir)"; \
+ fi;
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
- done \
- fi
+ $(INSTALL_DATA) "$$file" "$(distdir)/$(figdir)/$$basefile"; \
+ done
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
+ $(mkinstalldirs) "$(DESTDIR)$(docdir)";
for file in $(xml_files); do \
- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
+ cp "$(srcdir)/$$file" "$(DESTDIR)$(docdir)"; \
done
if test "$(figdir)"; then \
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
+ $(mkinstalldirs) "$(DESTDIR)$(docdir)/$(figdir)"; \
+ fi;
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
- done \
- fi
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$(figdir)/$$basefile"; \
+ done
install-data-hook: install-data-hook-omf
@@ -115,27 +115,25 @@
-if test "$(figdir)"; then \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(docdir)/$(figdir)/$$basefile; \
- rm -f $(docdir)/$(docname)/$(figdir)/$$basefile; \
- done; \
- rmdir $(DESTDIR)$(docdir)/$(figdir); \
- rmdir $(DESTDIR)$(docdir)/$(docname)/$(figdir); \
- fi
+ rm -f "$(DESTDIR)$(docdir)/$(figdir)/$$basefile"; \
+ done \
+ fi;
+ -if test "$(figdir)"; then \
+ for file in $(srcdir)/$(figdir)/*.png; do \
+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
+ rm -f "$(DESTDIR)$(docdir)/$(docname)/$(figdir)/$$basefile"; \
+ done \
+ fi;
-if test "$(docname)"; then \
for file in $(styledir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(docdir)/$(docname)/stylesheet/$$basefile; \
- done; \
- rmdir $(DESTDIR)$(docdir)/$(docname)/stylesheet; \
+ rm -f "$(DESTDIR)$(docdir)/$(docname)/stylesheet/$$basefile"; \
+ done \
for file in $(srcdir)/$(docname)/*.html; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(docdir)/$(docname)/$$basefile; \
- done; \
- rmdir $(DESTDIR)$(docdir)/$(docname); \
- fi
+ rm -f "$(DESTDIR)$(docdir)/$(docname)/$$basefile"; \
+ done \
+ fi;
-for file in $(xml_files); do \
- rm -f $(DESTDIR)$(docdir)/$$file; \
+ rm -f "$(DESTDIR)$(docdir)/$$file"; \
done
- -rmdir $(DESTDIR)$(docdir)
- -rmdir $(DESTDIR)$(datadir)/gnome/help/gnucash
-
More information about the gnucash-changes
mailing list