diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-11-16 12:02:21 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-11-16 12:03:19 +0100 |
| commit | f2c0ac2aa5435adbf514420616bfebd0d4ef2bef (patch) | |
| tree | fad35bf0a1803586b124328353e13e97c0310f60 | |
| parent | f7a155f1a9347400ba37e2c9e7dd2fb4e413205e (diff) | |
| download | scripts-f2c0ac2aa5435adbf514420616bfebd0d4ef2bef.tar.gz scripts-f2c0ac2aa5435adbf514420616bfebd0d4ef2bef.zip | |
create_tarball: Adapted to new 'core' folder for core modules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9db84075a083d851ec02917f926d44bc17e1f08e)
| -rwxr-xr-x | create_all_tarballs | 9 | ||||
| -rwxr-xr-x | 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 |