[#3732] Prevent nested directories when installing a second time

diff --git a/doc/sphinx/install-docs.sh.in b/doc/sphinx/install-docs.sh.in
index 816672f3e0cb7d55ed6fb16ca3b94cbc9a0878e9..9feaa638e1db3aab15bc9760195a534b58a1a112 100755 (executable)
--- a/doc/sphinx/install-docs.sh.in
+++ b/doc/sphinx/install-docs.sh.in
@@ -23,7 +23,7 @@ docdir="${target_path}/@docdir@"
 mandir8="${target_path}/@mandir8@"
 
 mkdir -p "${docdir}"
-cp -r @abs_sphinxbuilddir@/html "${docdir}"
+cp -Tr @abs_sphinxbuilddir@/html "${docdir}/html"
 if test '@HAVE_PDFLATEX@' != 'no'; then
     @INSTALL@ -c -m 644 @abs_sphinxbuilddir@/latex/kea-arm.pdf "${docdir}"
     @INSTALL@ -c -m 644 @abs_sphinxbuilddir@/latex/kea-messages.pdf "${docdir}"

diff --git a/install-meson-info.sh.in b/install-meson-info.sh.in
index 02b99638f5d74a035a606ebe04f06dedb86ac8cb..9e3f6ef5594b70b44c777e3929d6245b0cfda218 100755 (executable)
--- a/install-meson-info.sh.in
+++ b/install-meson-info.sh.in
@@ -9,4 +9,4 @@ if test -n "${MESON_INSTALL_DESTDIR_PREFIX+x}"; then
     target_path="${MESON_INSTALL_DESTDIR_PREFIX}"
 fi
 
-cp -r '@TOP_BUILD_DIR@/meson-info' "${target_path}/@DATADIR@/kea/meson-info"
+cp -Tr '@TOP_BUILD_DIR@/meson-info' "${target_path}/@DATADIR@/kea/meson-info"