fix configfiles bug

5 files changed, 7 insertions, 6 deletions

diff --git a/tests/apis/add_configfiles/config.h.in b/tests/apis/add_configfiles/config.h.in
index b9f406bbd..dcd698871 100644
--- a/tests/apis/add_configfiles/config.h.in
+++ b/tests/apis/add_configfiles/config.h.in
@@ -1,3 +1,2 @@
 #define HAVE_${module}_H 
 #define HELLO "${hello} ${ARCH} ${PLAT}"
-#define HELLO2 "@hello2@"
diff --git a/tests/apis/add_configfiles/config2.h.in b/tests/apis/add_configfiles/config2.h.in
new file mode 100644
index 000000000..3e6f71384
--- /dev/null
+++ b/tests/apis/add_configfiles/config2.h.in
@@ -0,0 +1,2 @@
+#define HAVE_@module@_H 
+#define HELLO2 "@hello@ @ARCH@ @PLAT@"
diff --git a/tests/apis/add_configfiles/main2.c b/tests/apis/add_configfiles/main2.c
index 16f779261..2bd25b908 100644
--- a/tests/apis/add_configfiles/main2.c
+++ b/tests/apis/add_configfiles/main2.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "config.h"
+#include "config2.h"
 
 int main(int argc, char** argv)
 {
diff --git a/tests/apis/add_configfiles/xmake.lua b/tests/apis/add_configfiles/xmake.lua
index db7b82138..6e66a1572 100644
--- a/tests/apis/add_configfiles/xmake.lua
+++ b/tests/apis/add_configfiles/xmake.lua
@@ -5,7 +5,7 @@ target("test")
 
     set_configdir("$(buildir)/config")
     add_configfiles("test.c.in", {filename = "mytest.c"})
-    add_configfiles("config.h.in", {variables = {hello = "xmake"}, prefixdir = "header"})
+    add_configfiles("config.h.in", {variables = {hello = "xmake", module = "test"}, prefixdir = "header"})
     add_configfiles("*.man", {copyonly = true, prefixdir = "man"})
     add_includedirs("$(buildir)/config/header")
 
@@ -16,6 +16,6 @@ target("test2")
 
     set_configdir("$(buildir)/config2")
     add_configfiles("test.c.in", {filename = "mytest.c"})
-    add_configfiles("config.h.in", {variables = {hello2 = "xmake2"}, pattern = "@(.-)@", prefixdir = "header"})
+    add_configfiles("config2.h.in", {variables = {hello = "xmake2", module = "test"}, pattern = "@(.-)@", prefixdir = "header"})
     add_configfiles("*.man", {onlycopy = true, prefixdir = "man"})
     add_includedirs("$(buildir)/config2/header")
diff --git a/xmake/actions/config/configfiles.lua b/xmake/actions/config/configfiles.lua
index fd3311266..1bdf268a2 100644
--- a/xmake/actions/config/configfiles.lua
+++ b/xmake/actions/config/configfiles.lua
@@ -126,11 +126,11 @@ function _generate_configfile(srcfile, dstfile, fileinfo, targets)
         if os.isfile(dstfile_tmp) then
             if os.isfile(dstfile) then
                 if io.readfile(dstfile_tmp) ~= io.readfile(dstfile) then
-                    os.mv(dstfile_tmp, dstfile)
+                    os.cp(dstfile_tmp, dstfile)
                     generated = true
                 end
             else
-                os.mv(dstfile_tmp, dstfile)
+                os.cp(dstfile_tmp, dstfile)
                 generated = true
             end
         end