diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-15 15:53:28 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-15 15:53:28 +0000 |
| commit | 0755365e33309ffc1c0985bd1a84558fb1ad0715 (patch) | |
| tree | c9b2ad6ca0aefc48ad6f868a9f050b6d3c68cba9 /crawl-ref | |
| parent | 547d7729392c008d4baaac82ea81d794a552fcd2 (diff) | |
| download | crawl-ref-0755365e33309ffc1c0985bd1a84558fb1ad0715.tar.gz crawl-ref-0755365e33309ffc1c0985bd1a84558fb1ad0715.zip | |
Account for the new database directory when building. Apply evktalo's
patch [1914727] to fix makefile.mgw, and apply similar changes to the
other makefiles to fix the same problem (untested).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3651 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/makefile.mgw | 3 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.unix | 7 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.x11 | 6 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.mgw | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw index 8b0585920d..14dbd6995f 100644 --- a/crawl-ref/source/makefile.mgw +++ b/crawl-ref/source/makefile.mgw @@ -131,10 +131,11 @@ endif mkdir $(INSTALLDIR)\dat 2>nul || echo "" >nul mkdir $(INSTALLDIR)\dat\clua 2>null || echo "">nul mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul + mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul copy /y dat\*.des $(INSTALLDIR)\dat - copy /y dat\*.txt $(INSTALLDIR)\dat copy /y dat\clua\*.lua $(INSTALLDIR)\dat\clua copy /y dat\descript\*.txt $(INSTALLDIR)\dat\descript + copy /y dat\database\*.txt $(INSTALLDIR)\dat\database copy /y ..\init.txt $(INSTALLDIR) clean: diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index df0a9db9d3..ecd37dcc5c 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -230,11 +230,14 @@ install: $(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 + mkdir -p $(DATADIR)/dat/descript + mkdir -p $(DATADIR)/dat/database cp dat/*.des $(DATADIR)/dat - cp -r dat/descript $(DATADIR)/dat - cp dat/*.txt $(DATADIR)/dat cp dat/clua/*.lua $(DATADIR)/dat/clua + cp dat/descript/*.txt $(DATADIR)/dat/descript + cp dat/database/*.txt $(DATADIR)/dat/database cp -r lua $(DATADIR)/dat mkdir -p $(DATADIR)/docs cp ../docs/*.txt $(DATADIR)/docs diff --git a/crawl-ref/source/makefile.x11 b/crawl-ref/source/makefile.x11 index 41e40dd08b..986368d25a 100644 --- a/crawl-ref/source/makefile.x11 +++ b/crawl-ref/source/makefile.x11 @@ -261,10 +261,14 @@ install: $(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 + mkdir -p $(DATADIR)/dat/descript + mkdir -p $(DATADIR)/dat/database cp dat/*.des $(DATADIR)/dat - cp dat/*.txt $(DATADIR)/dat cp dat/clua/*.lua $(DATADIR)/dat/clua + cp dat/descript/*.txt $(DATADIR)/dat/descript + cp dat/database/*.txt $(DATADIR)/dat/database cp -r lua $(DATADIR)/dat mkdir -p $(DATADIR)/docs cp ../docs/*.txt $(DATADIR)/docs diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw index 070e6aa024..140dbd0630 100644 --- a/crawl-ref/source/makefile_tiles.mgw +++ b/crawl-ref/source/makefile_tiles.mgw @@ -173,9 +173,11 @@ endif mkdir $(INSTALLDIR)\dat 2>nul || echo "" >nul mkdir $(INSTALLDIR)\dat\clua 2>null || echo "">nul mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul + mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul copy /y dat\*.des $(INSTALLDIR)\dat copy /y dat\clua\*.lua $(INSTALLDIR)\dat\clua copy /y dat\descript\*.txt $(INSTALLDIR)\dat\descript + copy /y dat\database\*.txt $(INSTALLDIR)\dat\database copy /y ..\*.txt $(INSTALLDIR) mkdir $(INSTALLDIR)\dat\tiles 2>nul || echo "" > nul copy /y dat\tiles\*.bmp $(INSTALLDIR)\dat\tiles |