From 9db84075a083d851ec02917f926d44bc17e1f08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 16 Nov 2020 12:02:21 +0100 Subject: create_tarball: Adapted to new 'core' folder for core modules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- create_all_tarballs | 9 ++++++--- create_tarball | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/create_all_tarballs b/create_all_tarballs index 33d8a40..81a7444 100755 --- a/create_all_tarballs +++ b/create_all_tarballs @@ -77,10 +77,13 @@ fi # Set target version if [ -z "$TARGET" ]; then - if [ -f main/tdelibs/tdecore/tdeversion.h ]; then + if [ -f main/core/tdelibs/tdecore/tdeversion.h ]; then + tdeversionHeader=main/core/tdelibs/tdecore/tdeversion.h + elif [ -f main/core/tdelibs/kdecore/kdeversion.h ]; then + tdeversionHeader=main/core/tdelibs/kdecore/kdeversion.h + elif [ -f main/tdelibs/tdecore/tdeversion.h ]; then tdeversionHeader=main/tdelibs/tdecore/tdeversion.h - fi - if [ -f main/tdelibs/kdecore/kdeversion.h ]; then + elif [ -f main/tdelibs/kdecore/kdeversion.h ]; then tdeversionHeader=main/tdelibs/kdecore/kdeversion.h fi if [ -z "$tdeversionHeader" ]; then diff --git a/create_tarball b/create_tarball index 282225d..11bd9ee 100755 --- a/create_tarball +++ b/create_tarball @@ -57,10 +57,13 @@ MODULE=${SUBROOT#$TDEROOT/main/} # Set target version if [ -z "$TARGET" ]; then - if [ -f $TDEROOT/main/tdelibs/tdecore/tdeversion.h ]; then + if [ -f $TDEROOT/main/core/tdelibs/tdecore/tdeversion.h ]; then + tdeversionHeader=$TDEROOT/main/core/tdelibs/tdecore/tdeversion.h + elif [ -f $TDEROOT/main/core/tdelibs/kdecore/kdeversion.h ]; then + tdeversionHeader=$TDEROOT/main/core/tdelibs/kdecore/kdeversion.h + elif [ -f $TDEROOT/main/tdelibs/tdecore/tdeversion.h ]; then tdeversionHeader=$TDEROOT/main/tdelibs/tdecore/tdeversion.h - fi - if [ -f $TDEROOT/main/tdelibs/kdecore/kdeversion.h ]; then + elif [ -f $TDEROOT/main/tdelibs/kdecore/kdeversion.h ]; then tdeversionHeader=$TDEROOT/main/tdelibs/kdecore/kdeversion.h fi if [ -z "$tdeversionHeader" ]; then -- cgit v1.2.1