diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 16:21:41 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 16:21:41 +0000 |
| commit | f1b88777017f5ce54b3d22b09fa130751a3cd6e3 (patch) | |
| tree | c9fa15b26e4380887a69512a07a81320e6eb3392 | |
| parent | dba89514fa11ce6a542eb1ef0bed9d8e8eacd752 (diff) | |
| download | crawl-ref-f1b88777017f5ce54b3d22b09fa130751a3cd6e3.tar.gz crawl-ref-f1b88777017f5ce54b3d22b09fa130751a3cd6e3.zip | |
Resync the Unix console and tiles makefiles, and use $(COPY)
consistently.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6562 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/makefile.unix | 27 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.unix | 26 |
2 files changed, 27 insertions, 26 deletions
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index 2b55f4bd15..125ba574ea 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -37,8 +37,9 @@ MCHMOD := 2755 MCHMOD_SAVEDIR := 775 # The user:group to install the game as. -INSTALL_UGRP ?= games:games -INSTALLDIR ?= /usr/games/crawl +INSTALL_UGRP := games: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 @@ -193,7 +194,7 @@ depend: $(OBJECTS:.o=.cc) ifeq ($(DOYACC),y) prebuildyacc: $(UTIL)levcomp.tab.cc $(UTIL)levcomp.tab.h $(UTIL)levcomp.lex.cc - cp $^ prebuilt/ + $(COPY) $^ prebuilt/ $(UTIL)levcomp.tab.cc: $(UTIL)levcomp.ypp cd $(UTIL) && $(YACC) -d -b levcomp levcomp.ypp \ @@ -207,12 +208,12 @@ else # Pull the level-compiler stuff up from prebuilt/ $(UTIL)levcomp.tab.cc: prebuilt/levcomp.tab.cc - cp prebuilt/*.h $(UTIL) - cp $< $@ + $(COPY) prebuilt/*.h $(UTIL) + $(COPY) $< $@ $(UTIL)levcomp.lex.cc: prebuilt/levcomp.lex.cc - cp $< $@ + $(COPY) $< $@ endif @@ -236,15 +237,15 @@ endif mkdir -p $(DATADIR)/dat/clua mkdir -p $(DATADIR)/dat/descript mkdir -p $(DATADIR)/dat/database - cp dat/*.des $(DATADIR)/dat - cp dat/lua/*.lua $(DATADIR)/dat/lua - cp dat/clua/*.lua $(DATADIR)/dat/clua - cp dat/descript/*.txt $(DATADIR)/dat/descript - cp dat/database/*.txt $(DATADIR)/dat/database + $(COPY) dat/*.des $(DATADIR)/dat + $(COPY) dat/lua/*.lua $(DATADIR)/dat/lua + $(COPY) dat/clua/*.lua $(DATADIR)/dat/clua + $(COPY) dat/descript/*.txt $(DATADIR)/dat/descript + $(COPY) dat/database/*.txt $(DATADIR)/dat/database mkdir -p $(DATADIR)/settings - cp ../settings/* $(DATADIR)/settings/ + $(COPY) ../settings/* $(DATADIR)/settings/ mkdir -p $(DATADIR)/docs - cp ../docs/*.txt $(DATADIR)/docs + $(COPY) ../docs/*.txt $(DATADIR)/docs chown -R $(INSTALL_UGRP) $(DATADIR) ifneq ($(SAVEDIR),) mkdir -p $(SAVEDIR) diff --git a/crawl-ref/source/makefile_tiles.unix b/crawl-ref/source/makefile_tiles.unix index f4d1c9ed0c..5a9f2b0278 100644 --- a/crawl-ref/source/makefile_tiles.unix +++ b/crawl-ref/source/makefile_tiles.unix @@ -199,7 +199,7 @@ depend: $(OBJECTS:.o=.cc) ifeq ($(DOYACC),y) prebuildyacc: $(UTIL)levcomp.tab.cc $(UTIL)levcomp.tab.h $(UTIL)levcomp.lex.cc - cp $^ prebuilt/ + $(COPY) $^ prebuilt/ $(UTIL)levcomp.tab.cc: $(UTIL)levcomp.ypp cd $(UTIL) && $(YACC) -d -b levcomp levcomp.ypp \ @@ -213,12 +213,12 @@ else # Pull the level-compiler stuff up from prebuilt/ $(UTIL)levcomp.tab.cc: prebuilt/levcomp.tab.cc - cp prebuilt/*.h $(UTIL) - cp $< $@ + $(COPY) prebuilt/*.h $(UTIL) + $(COPY) $< $@ $(UTIL)levcomp.lex.cc: prebuilt/levcomp.lex.cc - cp $< $@ + $(COPY) $< $@ endif @@ -235,7 +235,7 @@ makerltiles: cd $(RLTILES) && make -f makefile.unix all CFLAGS="$(PNG_INCLUDE)" LDFLAGS="$(PNG_LIB)" && cd .. $(TILEHEADERS): $(ORIGTILEHEADERS) - cp $(RLTILES)$@ . + $(COPY) $(RLTILES)$@ . $(ORIGTILEFILES): makerltiles @@ -267,17 +267,17 @@ endif mkdir -p $(DATADIR)/dat/clua mkdir -p $(DATADIR)/dat/descript mkdir -p $(DATADIR)/dat/database - cp dat/*.des $(DATADIR)/dat - cp dat/lua/*.lua $(DATADIR)/dat/lua - cp dat/clua/*.lua $(DATADIR)/dat/clua - cp dat/descript/*.txt $(DATADIR)/dat/descript - cp dat/database/*.txt $(DATADIR)/dat/database + $(COPY) dat/*.des $(DATADIR)/dat + $(COPY) dat/lua/*.lua $(DATADIR)/dat/lua + $(COPY) dat/clua/*.lua $(DATADIR)/dat/clua + $(COPY) dat/descript/*.txt $(DATADIR)/dat/descript + $(COPY) dat/database/*.txt $(DATADIR)/dat/database mkdir -p $(DATADIR)/settings - cp ../settings/* $(DATADIR)/settings/ + $(COPY) ../settings/* $(DATADIR)/settings/ mkdir -p $(DATADIR)/docs - cp ../docs/*.txt $(DATADIR)/docs + $(COPY) ../docs/*.txt $(DATADIR)/docs mkdir -p $(DATADIR)/dat/tiles - cp dat/tiles/*.png $(DATADIR)/dat/tiles + $(COPY) dat/tiles/*.png $(DATADIR)/dat/tiles chown -R $(INSTALL_UGRP) $(DATADIR) ifneq ($(SAVEDIR),) mkdir -p $(SAVEDIR) |