From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 31 Dec 2015 13:38:10 +0000 (+1100)
Subject: Makefile: be very specific
X-Git-Tag: xonotic-v0.8.2~1347
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=472e607d2ab4bfe9b1302af54078c903d3d65ca8;p=xonotic%2Fxonotic-data.pk3dir.git

Makefile: be very specific
---

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index a0848a185..20d935e61 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -53,17 +53,17 @@ export QCCFLAGS
 
 ../csprogs.dat: client/progs.inc $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/client\'
-	./qcc.sh client $@ $<
+	sh ./qcc.sh client $@ $<
 -include tmp/client.d
 
 ../progs.dat: server/progs.inc $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/server\'
-	./qcc.sh server $@ $<
+	sh ./qcc.sh server $@ $<
 -include tmp/server.d
 
 ../menu.dat: menu/progs.inc $(QCCVERSIONFILE)
 	@echo make[1]: Entering directory \`$(PWD)/menu\'
-	./qcc.sh menu $@ $<
+	sh ./qcc.sh menu $@ $<
 -include tmp/menu.d
 
 .PHONY: testcase
diff --git a/qcsrc/qcc.sh b/qcsrc/qcc.sh
index f0a734a6e..429771ce6 100755
--- a/qcsrc/qcc.sh
+++ b/qcsrc/qcc.sh
@@ -19,8 +19,8 @@ esac
 
 CPP="${CPP} -I. ${QCCIDENT} ${QCCDEFS} -D${PROG}"
 set -x
-${CPP} -CC -MMD -MP -MT ${OUT} -Wall -Wundef -Werror -o tmp/${MODE}.qc ${IN}
-${CPP} -dM 1>tmp/${MODE}_macros.txt -H 2>tmp/${MODE}_includes.txt ${IN}
-sed -i 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' tmp/${MODE}.qc
+${CPP} -CC -MMD -MP -MT ${OUT} -Wall -Wundef -Werror -o ./tmp/${MODE}.qc ${IN}
+${CPP} -dM 1>./tmp/${MODE}_macros.txt -H 2>./tmp/${MODE}_includes.txt ${IN}
+sed -i 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' ./tmp/${MODE}.qc
 cd ${MODE}
 ${QCC} ${QCCFLAGS} -o ../${OUT} ../tmp/${MODE}.qc