From 4499cbc60e818ddcb87ab00798c830cda0da26d9 Mon Sep 17 00:00:00 2001 From: heck Date: Thu, 5 Nov 2020 18:03:01 +0100 Subject: [PATCH] make install is now install sys wide, install-prefix gone, not needed. --- Makefile | 13 ++++--------- Makefile.conf | 6 ++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 16181bf..28658da 100644 --- a/Makefile +++ b/Makefile @@ -16,18 +16,13 @@ dist-egg: compile python3 setup.py bdist_egg -# installs the package into the user home -install: compile - python3 setup.py install --force --user - -# installs the package into PREFIX path -install-prefix: compile - python3 setup.py install --force $(PREFIX_OPT) - # installs the package system wide -install-sys: compile +install: compile python3 setup.py install --force +# installs the package into your user home +install-user: compile + python3 setup.py install --force --user # build the module into build/ compile: diff --git a/Makefile.conf b/Makefile.conf index e83e1e8..d288202 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -6,7 +6,7 @@ DIST_DIR = ./dist # Build config Defaults DEBUG=0 -PREFIX?=$(HOME) +PREFIX= ######### Overrides ######### -include $(HERE)local.conf @@ -15,4 +15,6 @@ ifeq ($(DEBUG),1) DEBUG_OPT+=--debug endif -PREFIX_OPT += --prefix=$(PREFIX) \ No newline at end of file +ifneq ($(PREFIX),) + PREFIX_OPT += --prefix=$(PREFIX) +endif