From 86d95a97f630bcf0abb3436ea44a753ccc57f89d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 13 Nov 2019 12:49:28 +0000 Subject: [PATCH] create-mkdebian.sh: Fix staging path Staging path by default is debian/tmp, and the packager (dh_install) looks there and in . for staged files, e.g. ./dist/src/jw-build-1.0.0-93/debian/tmp. This doesn't match the file system layout as created by jw-build's make install, which installs to ./dist/src/jw-build-1.0.0-93/debian/tmp/inst-root. Signed-off-by: Jan Lindemann --- scripts/create-mkdebian.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/create-mkdebian.sh b/scripts/create-mkdebian.sh index 9aa1fe1f..361e53aa 100644 --- a/scripts/create-mkdebian.sh +++ b/scripts/create-mkdebian.sh @@ -126,11 +126,16 @@ override_dh_auto_install: PATH=$JWB_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR) dh_installdirs +override_dh_install: + dh_install --sourcedir=./debian/tmp/inst-root + override_dh_shlibdeps: LD_LIBRARY_PATH=lib:\\\$(LD_LIBRARY_PATH) dh_shlibdeps override_dh_auto_clean: +override_dh_compress: + EOF }