diff options
author | Adam Borowski <kilobyte@angband.pl> | 2009-11-10 12:11:19 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-10 12:11:19 +0100 |
commit | ba3b7dbaad47d6e41d3763ec7dd6215bd74cfb5f (patch) | |
tree | 79d07bf2e1e9bb3c1fa69293d3d8c852c7c38e80 /crawl-ref/source/makefile | |
parent | eba5fc84b75c7dde072f1ba49a56f5e7913b8eb7 (diff) | |
download | crawl-ref-ba3b7dbaad47d6e41d3763ec7dd6215bd74cfb5f.tar.gz crawl-ref-ba3b7dbaad47d6e41d3763ec7dd6215bd74cfb5f.zip |
Fix installation with DATADIR="" DESTDIR="" prefix!=""
Diffstat (limited to 'crawl-ref/source/makefile')
-rw-r--r-- | crawl-ref/source/makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 6ae28c1a6f..36b91040bf 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -502,6 +502,10 @@ override DATADIR := $(strip $(prefix))/$(strip $(DATADIR)) endif endif CFOTHERS_L += -DDATA_DIR_PATH=\"$(abspath $(DATADIR))\" +else +ifneq ($(prefix),) +DATADIR := $(strip $(prefix))/$(strip $(DATADIR)) +endif endif datadir_fp := $(abspath $(strip $(DESTDIR))$(strip $(DATADIR))) |