From 06e875dc56729d4bbb922e59bb4cdd249b804800 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 18 Apr 2013 17:57:05 -0500 Subject: [PATCH] Update files and references in support of bug report 1446. --- acinclude.m4 | 6 +++--- contrib/splitup-kde-chunk-online | 2 +- developer-doc/phb/Makefile.am | 6 +++--- doc/en/Makefile.am | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 98d7003..027e025 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -612,13 +612,13 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share `tde-config --prefix`/share" + kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" - AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) + AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" else - KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl" + KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/tde-chunk.xsl" fi fi diff --git a/contrib/splitup-kde-chunk-online b/contrib/splitup-kde-chunk-online index e10a8ca..c6de7df 100755 --- a/contrib/splitup-kde-chunk-online +++ b/contrib/splitup-kde-chunk-online @@ -3,7 +3,7 @@ # split up an HTML file generated with e.g. # # /opt/trinity/bin/meinproc --check \ -# --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-chunk-online.xsl \ +# --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/tde-chunk-online.xsl \ # $(srcdir)/index.docbook -o index.xml; # # into several HTML files. While processing the input file - which diff --git a/developer-doc/phb/Makefile.am b/developer-doc/phb/Makefile.am index 1954b24..9e38295 100644 --- a/developer-doc/phb/Makefile.am +++ b/developer-doc/phb/Makefile.am @@ -15,7 +15,7 @@ endif .PHONY: all show preview get-files clear-files web all: $(TARGETS) $(PDF_TARGET) -STYLESHEET = kde-nochunk.xsl +STYLESHEET = tde-nochunk.xsl phb.html: $(DOCBOOK_FILES) @if test -e $(MEINPROC); then \ @@ -57,7 +57,7 @@ phb/index.html: $(DOCBOOK_FILES) rm -rf phb common; \ mkdir phb; \ mkdir common; \ - $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-chunk-online.xsl $(srcdir)/phb.docbook -o phb/index.xml; \ + $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/tde-chunk-online.xsl $(srcdir)/phb.docbook -o phb/index.xml; \ cd phb; \ $(abs_top_srcdir)/contrib/splitup-kde-chunk-online; \ rm index.xml; \ @@ -105,7 +105,7 @@ web-upload: sf-username web if GENERATE_PDF kmymoney-phb.pdf: $(DOCBOOK_FILES) $(MAKE) get-files - $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html + $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/tde-nochunk.xsl $(srcdir)/phb.docbook -o index.html recode utf8..latin1 index.html || : html2ps -o kmymoney-phb.ps -n index.html ps2pdf kmymoney-phb.ps kmymoney-phb.pdf diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 8839a2f..be4fb00 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -18,7 +18,7 @@ index.cache.bz2: $(DOCBOOK_FILES) $(KDE_XSL_STYLESHEET) $(SCREENSHOT_FILES) if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 --stylesheet $(KDE_XSL_STYLESHEET) $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 --stylesheet $(KDE_XSL_STYLESHEET) $(srcdir)/index.docbook; fi index.html: $(DOCBOOK_FILES) $(KDE_XSL_STYLESHEET) $(SCREENSHOT_FILES) - $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook --stdout | sed "s/ISO-8859-1/UTF-8/g" > index.html + $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/tde-nochunk.xsl $(srcdir)/index.docbook --stdout | sed "s/ISO-8859-1/UTF-8/g" > index.html .PHONY: show preview get-files clear-files web preview: index.html @@ -37,7 +37,7 @@ online-manual/index.xml: $(DOCBOOK_FILES) $(SCREENSHOT_FILES) mkdir online-manual; \ mkdir common; \ echo "Creating index.xml"; \ - $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-chunk-online.xsl $(srcdir)/index.docbook -o online-manual/index.xml; \ + $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/tde-chunk-online.xsl $(srcdir)/index.docbook -o online-manual/index.xml; \ cd online-manual; \ $(abs_top_srcdir)/contrib/splitup-kde-chunk-online; \ cd ..; \ @@ -110,7 +110,7 @@ PDF_TARGET = kmymoney-user.pdf kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES) $(MAKE) get-files - $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html; + $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/tde-nochunk.xsl $(srcdir)/index.docbook -o index.html; recode utf8..latin1 index.html || : html2ps -o kmymoney-user.ps -n index.html ps2pdf kmymoney-user.ps kmymoney-user.pdf