create_tarball: Adapted to new 'core' folder for core modules.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9db84075a0)

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

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