diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-22 12:26:53 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-22 12:26:53 +0000 |
| commit | abb8fd86e78c57461f6729faafec5ea35ccd18a9 (patch) | |
| tree | c262a150967152852cb015ddcd12a08530aedf7f /crawl-ref/source/makefile.unix | |
| parent | 609ccd171cbe8473c0a03c47392a12e72de2baaa (diff) | |
| download | crawl-ref-abb8fd86e78c57461f6729faafec5ea35ccd18a9.tar.gz crawl-ref-abb8fd86e78c57461f6729faafec5ea35ccd18a9.zip | |
Pull c_macro out of the code and into clua/macro.lua.
User-script dofile and loadfile check for "clua" anywhere in the file name and
refuse to load the file in that case; only core Crawl code can load Lua files
from clua/*.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1622 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile.unix')
| -rw-r--r-- | crawl-ref/source/makefile.unix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index 298e249f6a..9a6ed5998f 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -33,14 +33,14 @@ MCHMOD_SAVEDIR := 775 # The user:group to install the game as. INSTALL_UGRP := games:games -INSTALLDIR := /usr/games +INSTALLDIR := /usr/games/crawl # If you're installing Crawl for multiple users, you *must* set this to a # valid path before building Crawl. This is not necessary if you are building # Crawl for a single user. -# SAVEDIR := /usr/games/crawl-saves/ -# DATADIR := /usr/games/crawl-data/ +# SAVEDIR := /usr/games/crawl/saves/ +# DATADIR := /usr/games/crawl/data/ LEX := flex YACC := bison -y @@ -210,15 +210,16 @@ endif install: $(GAME) [ -d $(INSTALLDIR) ] || mkdir -p $(INSTALLDIR) - $(COPY) $(GAME) ${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/clua cp dat/*.des $(DATADIR)/dat cp dat/*.txt $(DATADIR)/dat + cp dat/clua/*.lua $(DATADIR)/dat/clua cp -r lua $(DATADIR)/dat mkdir -p $(DATADIR)/docs cp ../docs/*.txt $(DATADIR)/docs @@ -228,6 +229,7 @@ ifneq ($(SAVEDIR),) chown $(INSTALL_UGRP) $(SAVEDIR) chmod $(MCHMOD_SAVEDIR) $(SAVEDIR) endif + ln -s $(INSTALLDIR)/$(GAME) /usr/local/bin/ clean: $(DELETE) *.o |