diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-15 16:16:36 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-15 16:16:36 +0000 |
| commit | 796a19d5b93e4ac9f5a224d21a6bb3b2048aad5a (patch) | |
| tree | c9e7ac4c1775025123e5d3f412f185e477bd06b6 | |
| parent | 0755365e33309ffc1c0985bd1a84558fb1ad0715 (diff) | |
| download | crawl-ref-796a19d5b93e4ac9f5a224d21a6bb3b2048aad5a.tar.gz crawl-ref-796a19d5b93e4ac9f5a224d21a6bb3b2048aad5a.zip | |
Eliminate recursive copying from the build, as it'll copy the hidden SVN
directories, which aren't needed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3652 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/domake.sh | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.unix | 3 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.x11 | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/domake.sh b/crawl-ref/domake.sh index 31e5a26938..4680ab1740 100644 --- a/crawl-ref/domake.sh +++ b/crawl-ref/domake.sh @@ -14,5 +14,5 @@ fi if [ -d dat/lua ]; then true else - cp -r source/lua dat/lua + mkdir -p dat/lua && cp source/lua/*.lua dat/lua fi diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index ecd37dcc5c..341aa4533e 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -231,14 +231,15 @@ 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 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 - cp -r lua $(DATADIR)/dat mkdir -p $(DATADIR)/docs cp ../docs/*.txt $(DATADIR)/docs chown -R $(INSTALL_UGRP) $(DATADIR) diff --git a/crawl-ref/source/makefile.x11 b/crawl-ref/source/makefile.x11 index 986368d25a..e2f6daa245 100644 --- a/crawl-ref/source/makefile.x11 +++ b/crawl-ref/source/makefile.x11 @@ -262,14 +262,15 @@ 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 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 - cp -r lua $(DATADIR)/dat mkdir -p $(DATADIR)/docs cp ../docs/*.txt $(DATADIR)/docs mkdir -p $(DATADIR)/dat/tiles |