From 6908f5a4a09f9e993fd2bed605936e7875ee674d Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 18 Apr 2013 17:56:24 -0500 Subject: [PATCH] Update files and references in support of bug report 1446. --- acinclude.m4 | 6 +++--- doc/Makefile | 2 +- doc/kmyfirewall/Makefile | 2 +- kmyfirewall/installer/openbsd/Makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ffd6038..70b1bae 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/doc/Makefile b/doc/Makefile index f9a5982..b35f9d5 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -133,7 +133,7 @@ KDE_USE_FPIE = -fPIE KDE_USE_NMCHECK_FALSE = KDE_USE_NMCHECK_TRUE = # KDE_USE_PIE = -pie -KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl +KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/tde-chunk.xsl LDFLAGS = LDFLAGS_AS_NEEDED = LDFLAGS_NEW_DTAGS = diff --git a/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile index e891cd5..0a6aed6 100644 --- a/doc/kmyfirewall/Makefile +++ b/doc/kmyfirewall/Makefile @@ -117,7 +117,7 @@ KDE_USE_FPIE = -fPIE KDE_USE_NMCHECK_FALSE = KDE_USE_NMCHECK_TRUE = # KDE_USE_PIE = -pie -KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl +KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/tde-chunk.xsl LDFLAGS = LDFLAGS_AS_NEEDED = LDFLAGS_NEW_DTAGS = diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile index 3ed6adb..4e43cf5 100644 --- a/kmyfirewall/installer/openbsd/Makefile +++ b/kmyfirewall/installer/openbsd/Makefile @@ -171,7 +171,7 @@ KDE_USE_FPIE = -fPIE KDE_USE_NMCHECK_FALSE = KDE_USE_NMCHECK_TRUE = # KDE_USE_PIE = -pie -KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl +KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/tde-chunk.xsl LDFLAGS = LDFLAGS_AS_NEEDED = LDFLAGS_NEW_DTAGS =