Commit c4495143 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-dpkg-config'

parents 77ab786f 8c2d617e
...@@ -106,6 +106,7 @@ do case $Option in ...@@ -106,6 +106,7 @@ do case $Option in
done done
inst_dir=${inst_dir:-/usr/local} inst_dir=${inst_dir:-/usr/local}
dpkg=${dpkg:-/usr/bin/dpkg-deb}
# configure a light build if requested # configure a light build if requested
if [ $light -gt 0 ]; then if [ $light -gt 0 ]; then
...@@ -156,9 +157,9 @@ fi ...@@ -156,9 +157,9 @@ fi
# Automagically disable Debian packaging when the Debian packaging tools are # Automagically disable Debian packaging when the Debian packaging tools are
# not available. # not available.
if test $deb -gt 0 && test $pkg -gt 0 && ! test -x /usr/bin/dpkg-deb; then if test $deb -gt 0 && test $pkg -gt 0 && ! test -x "$dpkg"; then
pkg=0; pkg=0;
echo "Debian toolchain unavailable, Debian packaging disabled" echo "Debian toolchain unavailable, skipping Debian packaging"
fi fi
# Fetch the nw.js binary if we haven't already. We want to fetch it even # Fetch the nw.js binary if we haven't already. We want to fetch it even
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment