Browse Source

Update files and references in support of bug report 1446.

tags/r14.0.0
Darrell Anderson 6 years ago
parent
commit
307fab5fda
2 changed files with 5 additions and 5 deletions
  1. +3
    -3
      acinclude.m4.in
  2. +2
    -2
      am_edit

+ 3
- 3
acinclude.m4.in View File

@@ -644,13 +644,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/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


+ 2
- 2
am_edit View File

@@ -2004,7 +2004,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)/) {
@@ -2053,7 +2053,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";

Loading…
Cancel
Save