From ba3b7dbaad47d6e41d3763ec7dd6215bd74cfb5f Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Tue, 10 Nov 2009 12:11:19 +0100 Subject: Fix installation with DATADIR="" DESTDIR="" prefix!="" --- crawl-ref/source/makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'crawl-ref/source') 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))) -- cgit v1.2.3-54-g00ecf