summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in1
-rw-r--r--src/opkbuild.sh22
2 files changed, 12 insertions, 11 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index a5a1264..133e344 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,6 +30,7 @@ sh = @sh@
sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
s&@@PACKAGE_VERSION@@&$(package_version)&;\
+ s&@@BINDIR@@&$(bindir)&;\
s&@@LIBOPKBUILD@@&$(libopkbuild)&;\
s&@@SH@@&$(sh)&;
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index 27042ab..fecda93 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -77,7 +77,7 @@ main()
if [ "${opt_build}" != 'source' ]; then
print_arch_stats
- "${opt_check_build_deps}" && ob-checkbuilddeps
+ "${opt_check_build_deps}" && '@@BINDIR@@/ob-checkbuilddeps'
setup_build
build
clean
@@ -285,8 +285,8 @@ build_source()
esac
done
- OB_DO_SOURCE='true' ob-gencontrol
- OB_DO_SOURCE='true' ob-buildopk
+ OB_DO_SOURCE='true' '@@BINDIR@@/ob-gencontrol'
+ OB_DO_SOURCE='true' '@@BINDIR@@/ob-buildopk'
rm -Rf "src-${src}.data" || ob_error "$(ob_get_msg 'cant_rm_src_pkg_data')"
}
@@ -307,11 +307,11 @@ setup_build()
{
OPK_PACKAGES="$(ob_get_binary_packages -a "${OPK_HOST_ARCH}")"
- eval "$(ob-buildenv | sed 's/^/export /')"
+ eval "$('@@BINDIR@@/ob-buildenv' | sed 's/^/export /')"
- ob-unpacksource
- ob-applypatches
- ob-installplatconf
+ '@@BINDIR@@/ob-unpacksource'
+ '@@BINDIR@@/ob-applypatches'
+ '@@BINDIR@@/ob-installplatconf'
}
build()
@@ -321,9 +321,9 @@ build()
../build build
${opt_uid0_cmd} sh -s <<-EOF
../build install
- ob-installdocs
- ob-gencontrol
- ob-buildopk
+ '@@BINDIR@@/ob-installdocs'
+ '@@BINDIR@@/ob-gencontrol'
+ '@@BINDIR@@/ob-buildopk'
EOF
;;
'install'|'install-'*)
@@ -334,7 +334,7 @@ build()
;;
esac
- ob-genchanges
+ '@@BINDIR@@/ob-genchanges'
}
clean()