diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 16:36:43 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 16:36:43 +0000 |
| commit | a20addc5d92d362f113a446e989c6a34cccd3c6c (patch) | |
| tree | ba0466427ba6acf82326db57ea37840cf2929b3b /crawl-ref/source/makefile.x11 | |
| parent | a1daeea25c5d2187028661b6cd835ed3fee771e7 (diff) | |
| download | crawl-ref-a20addc5d92d362f113a446e989c6a34cccd3c6c.tar.gz crawl-ref-a20addc5d92d362f113a446e989c6a34cccd3c6c.zip | |
Moved all option files to settings directory.
Crawl loads init.txt from data file path if it can't find any other .crawlrc.
makefile changes to copy settings directory to install dir. Tested only on Linux/tty.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5258 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile.x11')
| -rw-r--r-- | crawl-ref/source/makefile.x11 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/makefile.x11 b/crawl-ref/source/makefile.x11 index fb3031f5e3..4e453f13be 100644 --- a/crawl-ref/source/makefile.x11 +++ b/crawl-ref/source/makefile.x11 @@ -27,7 +27,7 @@ MCHMOD := 2755 # Permissions to set on the save directory. MCHMOD_SAVEDIR := 775 -# The user:group to install the game as. +# The user:group to install the game as. INSTALL_UGRP := games:games INSTALLDIR := /usr/games/crawl @@ -231,13 +231,13 @@ clean-rltiles: # install: $(GAME) +ifeq ($(DATADIR),) + $(error DATADIR not set! Set DATADIR and run make clean install again) +endif [ -d $(INSTALLDIR) ] || mkdir -p $(INSTALLDIR) $(COPY) $(GAME) $(INSTALLDIR) chown $(INSTALL_UGRP) $(INSTALLDIR)/$(GAME) chmod ${MCHMOD} ${INSTALLDIR}/$(GAME) -ifeq ($(DATADIR),) - $(error DATADIR not set! Set DATADIR and run make clean install again) -endif mkdir -p $(DATADIR)/dat mkdir -p $(DATADIR)/dat/lua mkdir -p $(DATADIR)/dat/clua @@ -248,6 +248,8 @@ endif cp dat/clua/*.lua $(DATADIR)/dat/clua cp dat/descript/*.txt $(DATADIR)/dat/descript cp dat/database/*.txt $(DATADIR)/dat/database + mkdir -p $(DATADIR)/settings + cp ../settings/* $(DATADIR)/settings/ mkdir -p $(DATADIR)/docs cp ../docs/*.txt $(DATADIR)/docs mkdir -p $(DATADIR)/dat/tiles |