summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2013-04-18 17:49:01 -0500
committerDarrell Anderson <[email protected]>2013-04-18 17:49:01 -0500
commit73f38e8cc1a2c33f6f433cd576d2377281b8b79e (patch)
tree1d93ce9926d25fd5fd7aed833aeecd568180f007
parentbc82b3f8c77564d69c4bb1dbd4e775739a624bf2 (diff)
downloadkbarcode-73f38e8cc1a2c33f6f433cd576d2377281b8b79e.tar.gz
kbarcode-73f38e8cc1a2c33f6f433cd576d2377281b8b79e.zip
Update files and references in support of bug report 1446.
-rw-r--r--acinclude.m46
m---------admin0
2 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 6673767..fa43fa0 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