Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

respect DESTDIR when calling setup.py

  • Loading branch information...
commit d4c32ee283e9e0b3f77ea73dd8d0a46874dda0ea 1 parent 8c9c07a
@keis authored
Showing with 6 additions and 7 deletions.
  1. +5 −6 Makefile
  2. +1 −1  misc/env.sh
View
11 Makefile
@@ -9,9 +9,7 @@ RUN_PREFIX ?= $(PREFIX)
ENABLE_WEBKIT2 ?= auto
ENABLE_GTK3 ?= auto
-PYTHON=python3
-PYTHONV=$(shell $(PYTHON) --version | sed -n /[0-9].[0-9]/p)
-COVERAGE=$(shell which coverage)
+PYTHON?=python3
# --- configuration ends here ---
@@ -49,6 +47,8 @@ ARCH:=$(shell uname -m)
COMMIT_HASH:=$(shell ./misc/hash.sh)
+COVERAGE:=$(shell which coverage)
+
CPPFLAGS += -D_BSD_SOURCE -D_POSIX_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
PKG_CFLAGS:=$(shell pkg-config --cflags $(REQ_PKGS))
@@ -147,8 +147,7 @@ strip:
SANDBOXOPTS=\
DESTDIR=./sandbox\
- RUN_PREFIX=`pwd`/sandbox/usr/local\
- PYINSTALL_EXTRA='--root=./sandbox'
+ RUN_PREFIX=`pwd`/sandbox/usr/local
sandbox: misc/env.sh
mkdir -p sandbox/${PREFIX}/lib64
@@ -182,7 +181,7 @@ install-uzbl-core: uzbl-core install-dirs
install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
install-event-manager: install-dirs
- $(PYTHON) setup.py install $(PYINSTALL_EXTRA)
+ $(PYTHON) setup.py install --root=${DESTDIR}/
install-uzbl-browser: install-dirs install-uzbl-core install-event-manager
sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < bin/uzbl-browser > $(INSTALLDIR)/bin/uzbl-browser
View
2  misc/env.sh
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=$HOME/.config
export XDG_CONFIG_HOME
# Needed to run uzbl-browser etc from here.
-PATH="$(pwd)/sandbox/usr/local/bin:$PATH"
+PATH="$(pwd)/sandbox/usr/local/bin:$(pwd)/sandbox/usr/bin:$PATH"
export PATH
# Figure out where setup have installed stuff
Please sign in to comment.
Something went wrong with that request. Please try again.