diff options
| author | Andrew Waterman <waterman@eecs.berkeley.edu> | 2015-05-18 15:29:04 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@eecs.berkeley.edu> | 2015-05-18 15:29:04 -0700 |
| commit | b2251a985c46fb0399d154557937cd5535f6f1af (patch) | |
| tree | 4cb42d6a769c784e47ff9ab70c24aec237934d20 | |
| parent | c5f18f61c07228f6606d2217230751d8ec6e091a (diff) | |
| parent | 3cf271ebe5ba6f1f1d16b0fed4b50f1b88cd3caa (diff) | |
| download | pk-b2251a985c46fb0399d154557937cd5535f6f1af.zip pk-b2251a985c46fb0399d154557937cd5535f6f1af.tar.gz pk-b2251a985c46fb0399d154557937cd5535f6f1af.tar.bz2 | |
Merge pull request #9 from palmer-dabbelt/destdir
Change the behavior of the DESTDIR make variable
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index a6c22d8..0c1a07e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,14 +55,14 @@ enable_stow := @enable_stow@ ifeq ($(enable_stow),yes) stow_pkg_dir := $(prefix)/pkgs - DESTDIR ?= $(stow_pkg_dir)/$(project_name)-$(project_ver) + INSTALLDIR ?= $(DESTDIR)/$(stow_pkg_dir)/$(project_name)-$(project_ver) else - DESTDIR ?= $(prefix) + INSTALLDIR ?= $(DESTDIR)/$(prefix) endif -install_hdrs_dir := $(DESTDIR)/include/$(project_name) -install_libs_dir := $(DESTDIR)/lib/$(project_name) -install_exes_dir := $(DESTDIR)/bin +install_hdrs_dir := $(INSTALLDIR)/include/$(project_name) +install_libs_dir := $(INSTALLDIR)/lib/$(project_name) +install_exes_dir := $(INSTALLDIR)/bin #------------------------------------------------------------------------- # List of subprojects |