Commit 4dc59c4a authored by Albert Gräf's avatar Albert Gräf
Browse files

More installer bugfixes, prevent error messages when the Debian packaging tools are not available.

parent c1c71a88
...@@ -106,6 +106,10 @@ if [[ $os == "darwin" ]]; then ...@@ -106,6 +106,10 @@ if [[ $os == "darwin" ]]; then
os=osx os=osx
fi fi
# Automagically disable Debian packaging when the Debian packaging tools are
# not available.
test $deb -eq 0 || test -x /usr/bin/dpkg-deb || pkg=0
# XXXTODO: If no build target has been set, we should pick one by default. # XXXTODO: If no build target has been set, we should pick one by default.
# 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
......
...@@ -141,7 +141,9 @@ debstage: $(bindir) ...@@ -141,7 +141,9 @@ debstage: $(bindir)
# Pd-related scripts # Pd-related scripts
#install -p $(scripts_src)/pd-diff $(DESTDIR)$(bindir) #install -p $(scripts_src)/pd-diff $(DESTDIR)$(bindir)
ifeq ($(PACKAGE_TYPE),deb)
deb: DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) deb: DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
endif
deb: DEB_PD_VERSION := $(shell echo $(PD_VERSION) | sed 's|\(.*\)-l2ork-\(.*\)|\1-\2|') deb: DEB_PD_VERSION := $(shell echo $(PD_VERSION) | sed 's|\(.*\)-l2ork-\(.*\)|\1-\2|')
deb: debstage deb: debstage
# delete these since they are provided by the 'puredata-utils' and 'cyclist' package # delete these since they are provided by the 'puredata-utils' and 'cyclist' package
......
Markdown is supported
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