aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2022-04-03 18:25:43 -0500
committerRob Landley <rob@landley.net>2022-04-03 18:25:43 -0500
commit5d0fcd04ffc66bd5718c3b9877df0c71429e1ab3 (patch)
tree8e8a96edca041402861de746a3527b1c8e4264a6
parent5e7aef4d24b084a51bd2c6dd6258d32873e61b34 (diff)
downloadtoybox-5d0fcd04ffc66bd5718c3b9877df0c71429e1ab3.tar.gz
Give "make install" a default location it can actually install to, where
you can tar it up from to extract somewhere else if you like.
-rw-r--r--Makefile8
-rwxr-xr-xscripts/install.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 02228afe..40987027 100644
--- a/Makefile
+++ b/Makefile
@@ -41,13 +41,13 @@ baseline: generated/unstripped/toybox
bloatcheck: generated/unstripped/toybox_old generated/unstripped/toybox
@scripts/bloatcheck generated/unstripped/toybox_old generated/unstripped/toybox
-install_flat:
+install_flat: toybox
scripts/install.sh --symlink --force
-install_airlock:
+install_airlock: toybox
scripts/install.sh --symlink --force --airlock
-install:
+install: toybox
scripts/install.sh --long --symlink --force
uninstall_flat:
@@ -65,7 +65,7 @@ root_clean:
clean::
@chmod -fR 700 generated || true
- @rm -rf toybox generated change .singleconfig*
+ @rm -rf toybox generated change install .singleconfig*
@echo cleaned
# If singlemake was in generated/ "make clean; make test_ls" wouldn't work.
diff --git a/scripts/install.sh b/scripts/install.sh
index 489112ae..56213ade 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -4,7 +4,7 @@
source ./configure
-[ -z "$PREFIX" ] && PREFIX="/usr/toybox"
+[ -z "$PREFIX" ] && PREFIX="$PWD/install"
# Parse command line arguments.