summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makefile
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-11-08 21:52:44 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-11-08 22:38:14 +0100
commit6a43fcb066748c642a08bf28764e69ab1a5d57b9 (patch)
treea7c4ba511be07977e74cb9bbcfbd2d52d2611f05 /crawl-ref/source/makefile
parentb1a34dea62d41e47154b047011df2931e009cba0 (diff)
downloadcrawl-ref-6a43fcb066748c642a08bf28764e69ab1a5d57b9.tar.gz
crawl-ref-6a43fcb066748c642a08bf28764e69ab1a5d57b9.zip
Don't make DATADIR mandatory.
Diffstat (limited to 'crawl-ref/source/makefile')
-rw-r--r--crawl-ref/source/makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index 24e2eca81e..aa9de5f172 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -434,8 +434,8 @@ endif
ifneq ($(strip $(DATADIR)),)
CFOTHERS_L += -DDATA_DIR_PATH=\"$(abspath $(strip $(prefix))/$(strip $(DATADIR)))\"
-datadir_fp := $(abspath $(strip $(prefix_fp))/$(strip $(DATADIR)))
endif
+datadir_fp := $(abspath $(strip $(prefix_fp))/$(strip $(DATADIR)))
ifndef NO_NCURSES
@@ -696,9 +696,6 @@ endif
# The actual build targets
#
install: $(GAME)
-ifeq ($(DATADIR),)
- $(error DATADIR not set! Set DATADIR and run make clean install again)
-endif
[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
$(STRIP) -s $(prefix_fp)/$(bin_prefix)/$(GAME)