diff options
| author | Darrell Anderson <[email protected]> | 2013-04-18 17:50:50 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-04-18 17:50:50 -0500 |
| commit | c54f1984435b01a525b6cd94b25b476982515b48 (patch) | |
| tree | df78228a53f354a2ede961f9efeb333c5a3acde3 | |
| parent | 963fb997850f8ecb5c1c780e19269c37b83f80d2 (diff) | |
| download | kchmviewer-c54f1984435b01a525b6cd94b25b476982515b48.tar.gz kchmviewer-c54f1984435b01a525b6cd94b25b476982515b48.zip | |
Update files and references in support of bug report 1446.
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | am_edit | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ff7bb45..b6e2124 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" + 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/admin b/admin -Subproject 307fab5fdad542247fa11a418be0e9635f4b5eb +Subproject 4027b878fb556a51ed29affd578e78aa7099748 @@ -1607,7 +1607,7 @@ sub tag_DOCFILES () } $lookup = 'KDE_XSL_STYLESHEET\s*='; if ($MakefileData !~ /\n($lookup)/) { - $lines .= "KDE_XSL_STYLESHEET=/\$(kde_datadir)/ksgmltools2/customization/kde-chunk.xsl\n"; + $lines .= "KDE_XSL_STYLESHEET=/\$(kde_datadir)/ksgmltools2/customization/tde-chunk.xsl\n"; } $lookup = '\nindex.cache.bz2:'; if ($MakefileData !~ /\n($lookup)/) { @@ -1653,7 +1653,7 @@ sub tag_DOCFILES () $tmp .= "\tdone\n"; if ($appname eq 'common') { $tmp .= "\t\@echo \"merging common and language specific dir\" ;\\\n"; - $tmp .= "\tif test ! -f \$(kde_htmldir)/en/common/kde-common.css; then echo 'no english docs found in \$(kde_htmldir)/en/common/'; exit 1; fi \n"; + $tmp .= "\tif test ! -f \$(kde_htmldir)/en/common/tde-common.css; then echo 'no english docs found in \$(kde_htmldir)/en/common/'; exit 1; fi \n"; $tmp .= "\t\@com_files=`cd \$(kde_htmldir)/en/common && echo *` ;\\\n"; $tmp .= "\tcd \$(DESTDIR)\$(kde_htmldir)/$kdelang/common ;\\\n"; $tmp .= "\tif test -n \"\$\$com_files\"; then for p in \$\$com_files ; do \\\n"; |