[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    l10n-kf5/scripts
From:       Burkhard Lück <null () kde ! org>
Date:       2018-03-26 5:01:25
Message-ID: E1f0KG5-00085s-0R () code ! kde ! org
[Download RAW message or body]

SVN commit 1512873 by lueck:

Use new install targets in autogen.sh

https://api.kde.org/ecm/kde-module/KDEInstallDirs.html reads:
MAN_INSTALL_DIR + HTML_INSTALL_DIR are deprecated
switch to KDE_INSTALL_MANDIR / KDE_INSTALL_DOCBUNDLEDIR

Differential Revision: https://phabricator.kde.org/D11697


 M  +5 -5      autogen.sh  


--- trunk/l10n-kf5/scripts/autogen.sh #1512872:1512873
@@ -13,7 +13,7 @@
         fname=$(basename $manfile)
         name=${fname%.docbook}
         no=${name##*.}
-        echo "kdoctools_create_manpage($fname $no INSTALL_DESTINATION \
\${MAN_INSTALL_DIR}/\${CURRENT_LANG}/ )" >> $subdir/CMakeLists.txt +        echo \
"kdoctools_create_manpage($fname $no INSTALL_DESTINATION \
\${KDE_INSTALL_MANDIR}/\${CURRENT_LANG}/ )" >> $subdir/CMakeLists.txt  done
 }
 
@@ -36,7 +36,7 @@
         echo "add_subdirectory( $subdir )" >> $dir_local/CMakeLists.txt
         if test -f $dir_local/index.docbook; then
             if ! grep -q "kdoctools_create_handbook" $dir_local/CMakeLists.txt; then
-                echo "kdoctools_create_handbook(index.docbook INSTALL_DESTINATION \
\${HTML_INSTALL_DIR}/\${CURRENT_LANG}/ SUBDIR $subdir )" >> $dir_local/CMakeLists.txt \
+                echo "kdoctools_create_handbook(index.docbook INSTALL_DESTINATION \
\${KDE_INSTALL_DOCBUNDLEDIR}/\${CURRENT_LANG}/ SUBDIR $subdir )" >> \
$dir_local/CMakeLists.txt  fi
         fi
         add_cmake_files_doc $dir_local/$subdir
@@ -45,8 +45,8 @@
                echo "FILE(GLOB _html *.html)" >> $dir_local/$subdir/CMakeLists.txt
                echo "FILE(GLOB _css *.css)" >> $dir_local/$subdir/CMakeLists.txt
                echo "FILE(GLOB _pngs *.png)" >> $dir_local/$subdir/CMakeLists.txt
-               echo "install( FILES \${_html} \${_css} \${_png} DESTINATION \
                \${HTML_INSTALL_DIR}/\${CURRENT_LANG}/common)" >> \
                $dir_local/$subdir/CMakeLists.txt
-               #howto install the missing symlinks e.g. \
${HTML_INSTALL_DIR}/en/common/1.png  \
${HTML_INSTALL_DIR}/\${CURRENT_LANG}/common/1.png ? +               echo "install( \
FILES \${_html} \${_css} \${_png} DESTINATION \
\${KDE_INSTALL_DOCBUNDLEDIR}/\${CURRENT_LANG}/common)" >> \
$dir_local/$subdir/CMakeLists.txt +               #howto install the missing symlinks \
e.g. ${KDE_INSTALL_DOCBUNDLEDIR}/en/common/1.png  \
${KDE_INSTALL_DOCBUNDLEDIR}/\${CURRENT_LANG}/common/1.png ?  ;;
            *)
                if test -f $dir_local/$subdir/index.docbook; then
@@ -79,7 +79,7 @@
                        add_subdir="SUBDIR $subdir"
                    fi
 
-                   echo "kdoctools_create_handbook(index.docbook INSTALL_DESTINATION \
\${HTML_INSTALL_DIR}/\${CURRENT_LANG}/ $add_subdir )" >> \
$dir_local/$subdir/CMakeLists.txt +                   echo \
"kdoctools_create_handbook(index.docbook INSTALL_DESTINATION \
\${KDE_INSTALL_DOCBUNDLEDIR}/\${CURRENT_LANG}/ $add_subdir )" >> \
$dir_local/$subdir/CMakeLists.txt  fi
                ;;
         esac


[prev in list] [next in list] [prev in thread] [next in thread]