diff --git a/scripts/create-mkdebian.sh b/scripts/create-mkdebian.sh index a5f49afe..5e3d341d 100644 --- a/scripts/create-mkdebian.sh +++ b/scripts/create-mkdebian.sh @@ -105,7 +105,7 @@ override_dh_auto_install: mkdir -p \`dirname \$INSTALL_LOG\` > \$INSTALL_LOG \\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install - /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR) + /bin/bash $dir/pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR) dh_installdirs override_dh_shlibdeps: diff --git a/scripts/create-mkspec.sh b/scripts/create-mkspec.sh index 0d647898..183f6d23 100644 --- a/scripts/create-mkspec.sh +++ b/scripts/create-mkspec.sh @@ -65,7 +65,7 @@ _cat << EOT |echo "mkdir -p \`dirname \$INSTALL_LOG\`" |echo "> \$INSTALL_LOG" |echo "make install" - |echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`" + |echo "/bin/bash $dir/pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`" |echo "" EOT ini_value global.subpackages | grep -q run && _cat << EOT diff --git a/scripts/pkg.sh b/scripts/pkg.sh index cdc601d4..c611dfc3 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -432,7 +432,7 @@ build_pkg() fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"." [ ! -r "$create_mkdef_sh" ] && \ fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"." - PATH=`dirname $0`:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp + /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp mv $mkdef_sh.tmp $mkdef_sh tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh" }