summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2013-04-18 18:07:24 -0500
committerDarrell Anderson <[email protected]>2013-04-18 18:07:24 -0500
commit3caa82c92209ec625fb3249d6326e65a42b918b7 (patch)
tree192f8abafc9c133806fc040377fd71d89559b0e4
parent4ba92d123cc59fe838937e68dabcbbb6fc633a60 (diff)
downloadtde-systemsettings-3caa82c92209ec625fb3249d6326e65a42b918b7.tar.gz
tde-systemsettings-3caa82c92209ec625fb3249d6326e65a42b918b7.zip
Update files and references in support of bug report 1446.
-rw-r--r--acinclude.m46
-rw-r--r--aclocal.m46
2 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 0529e63..855a2a5 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/aclocal.m4 b/aclocal.m4
index 707c3e2..9ef3d96 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -624,13 +624,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