summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-06-14 22:48:50 +0800
committerruki <[email protected]>2024-06-14 22:48:50 +0800
commit2896c4ca3ac7010f8c0c63e8fd3b09721b118b64 (patch)
treecd0daa35bea37798f4410b048742517321504572
parent8c65293ec7f60a3f6e72247b079c2dd458b72461 (diff)
fix install cmds
-rw-r--r--xmake/plugins/pack/deb/main.lua6
-rwxr-xr-xxmake/scripts/xpack/deb/debian/rules7
2 files changed, 9 insertions, 4 deletions
diff --git a/xmake/plugins/pack/deb/main.lua b/xmake/plugins/pack/deb/main.lua
index bf28be243..0eba9becb 100644
--- a/xmake/plugins/pack/deb/main.lua
+++ b/xmake/plugins/pack/deb/main.lua
@@ -41,7 +41,7 @@ end
-- translate the file path
function _translate_filepath(package, filepath)
- return filepath:replace(package:install_rootdir(), "%{buildroot}/%{_exec_prefix}", {plain = true})
+ return filepath:replace(package:install_rootdir(), "/usr", {plain = true})
end
-- get install command
@@ -128,12 +128,12 @@ function _get_specvars(package)
end
end
package:set("prefixdir", prefixdir)
- return table.concat(installcmds, "\n")
+ return table.concat(installcmds, "\n\t")
end
specvars.PACKAGE_BUILDCMDS = function ()
local buildcmds = {}
_get_buildcmds(package, buildcmds, batchcmds.get_buildcmds(package):cmds())
- return table.concat(buildcmds, "\n")
+ return table.concat(buildcmds, "\n\t")
end
specvars.PACKAGE_BUILDREQUIRES = function ()
local requires = {}
diff --git a/xmake/scripts/xpack/deb/debian/rules b/xmake/scripts/xpack/deb/debian/rules
index 595df8ca4..0fe50f5c8 100755
--- a/xmake/scripts/xpack/deb/debian/rules
+++ b/xmake/scripts/xpack/deb/debian/rules
@@ -7,6 +7,12 @@ configure-stamp:
dh_testdir
touch configure-stamp
+build-arch:
+ # pass
+
+build-indep:
+ # pass
+
build: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -22,7 +28,6 @@ clean:
install: build
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs
${PACKAGE_INSTALLCMDS}