diff options
| -rw-r--r-- | crawl-ref/dolinks.sh | 11 | ||||
| -rw-r--r-- | crawl-ref/domake.sh | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/crawl-ref/dolinks.sh b/crawl-ref/dolinks.sh index 03fd25be58..e07f884f45 100644 --- a/crawl-ref/dolinks.sh +++ b/crawl-ref/dolinks.sh @@ -3,18 +3,11 @@ mkdir -p NORMAL mkdir -p WIZARD -pushd NORMAL ; ln -sf ../source/rltiles . ; ln -sf ../source/util . ; ln -sf ../source/*.h ../source/*.cc ../source/makefile* . ; popd -pushd WIZARD ; ln -sf ../source/rltiles . ; ln -sf ../source/util . ; ln -sf ../source/*.h ../source/*.cc ../source/makefile* . ; popd +pushd NORMAL ; ln -sf ../source . ; popd +pushd WIZARD ; ln -sf ../source . ; popd if [ -d dat ]; then true else ln -sf source/dat dat fi - -if [ -d tiles ]; then - true -else - ln -sf source/rltiles tiles - pushd source/dat/tiles ; ln -sf ../../rltiles/*.png . ; popd -fi diff --git a/crawl-ref/domake.sh b/crawl-ref/domake.sh index 8306bc2c7e..4ae1a8d6fe 100644 --- a/crawl-ref/domake.sh +++ b/crawl-ref/domake.sh @@ -2,12 +2,13 @@ #jmf: automate making normal & wizard binaries, until they merge #jmf: N.B.: requires symlink directories; run ./dolinks.sh to make -pushd NORMAL && make && popd && pushd WIZARD && make wizard ; popd +pushd NORMAL/source ; make ; popd +pushd WIZARD/source ; make wizard ; popd -if [ -f NORMAL/crawl ]; then - ln -sf NORMAL/crawl ncrawl +if [ -f NORMAL/source/crawl ]; then + ln -sf NORMAL/source/crawl ncrawl fi -if [ -f WIZARD/crawl ]; then - ln -sf WIZARD/crawl wcrawl +if [ -f WIZARD/source/crawl ]; then + ln -sf WIZARD/source/crawl wcrawl fi |