improve configure

2 files changed, 16 insertions, 11 deletions

diff --git a/configure b/configure
index d195786c1..64c568180 100755
--- a/configure
+++ b/configure
@@ -253,15 +253,11 @@ _os_date() {
 # we avoid use `basename`, because it's slow
 path_filename() {
     local path="${1}"
-    local oldifs="${IFS}"
-    IFS='/'
-    set -- ${path}
-    local filename=""
-    for item in $@; do
-        filename="$item"
-    done
-    _ret="${filename}"
-    IFS="${oldifs}"
+    if test_eq "${path}" "/"; then
+        _ret="/"
+    else
+        _ret="${path##*/}"
+    fi
 }
 
 path_extension() {
diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh
index 36d40ffb7..e0a753639 100755
--- a/core/src/demo/xmake.sh
+++ b/core/src/demo/xmake.sh
@@ -24,8 +24,17 @@ target "demo"
 
     # add install files
     add_installfiles "${projectdir}/(xmake/**.lua)" "share"
-    add_installfiles "${projectdir}/(xmake/scripts/**)" "share"
-    add_installfiles "${projectdir}/(xmake/templates/**)" "share"
+    add_installfiles "${projectdir}/(xmake/scripts/**.sh)" "share"
+    add_installfiles "${projectdir}/(xmake/scripts/**.cmake)" "share"
+    add_installfiles "${projectdir}/(xmake/scripts/**.pl)" "share"
+    add_installfiles "${projectdir}/(xmake/scripts/**.cpp)" "share"
+    add_installfiles "${projectdir}/(xmake/scripts/gitignore)" "share"
+    add_installfiles "${projectdir}/(xmake/scripts/PkgInfo)" "share"
+    add_installfiles "${projectdir}/(xmake/templates/**.c)" "share"
+    add_installfiles "${projectdir}/(xmake/templates/**.cpp)" "share"
+    add_installfiles "${projectdir}/(xmake/templates/**.m)" "share"
+    add_installfiles "${projectdir}/(xmake/templates/**.mm)" "share"
+    add_installfiles "${projectdir}/(xmake/templates/**.h)" "share"
     add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo"
 
     # add syslinks