summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-07-06 15:26:54 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-07-06 08:04:20 -0700
commitd1ee789558d9f6d71f96a354a9cc756953c80875 (patch)
treed682237661ad890954e8f6cf54553b86a350d3c1
parent70c000c905233030b9b2291deaa294413720f708 (diff)
downloadsubsurface-d1ee789558d9f6d71f96a354a9cc756953c80875.tar.gz
ssrf: remove LIBRARY_PATH from makefile
build.sh (line 468,469) uses LIBRARY_PATH, but make can do without. Removed LIBRARY_PATH Signed-off-by: Jan Iversen <jani@apache.org>
-rw-r--r--makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/makefile b/makefile
index effbdb4b2..a1ee79bc4 100644
--- a/makefile
+++ b/makefile
@@ -11,17 +11,17 @@ default_target: all
mobile:
if test ! -d build-mobile; then (echo "error: please run build.sh before make"; exit -1;); fi
- cd build-mobile; LIBRARY_PATH=../install_root/lib make
- cd build-mobile; LIBRARY_PATH=../install_root/lib make install
+ cd build-mobile; make
+ cd build-mobile; make install
desktop:
if test ! -d build; then (echo "error: please run build.sh before make"; exit -1;); fi
- cd build; LIBRARY_PATH=../install_root/lib make
- cd build; LIBRARY_PATH=../install_root/lib make install
+ cd build; make
+ cd build; make install
check:
if test ! -d build; then (echo "error: please run build.sh before make"; exit -1;); fi
- cd build; LIBRARY_PATH=../install_root/lib make check
+ cd build; make check
all: desktop mobile check