X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=Makefile;h=2c77a91754b6306b5345d31beb4ba23b9a42255e;hp=69484068643d042a9beebac5763a0932928e0e49;hb=c6297696eda1a5a66f2d25b1358e2b21898ab3ea;hpb=6e2745caaf6bf6893b57c99b2d9a449aac49509f

diff --git a/Makefile b/Makefile
index 69484068..2c77a917 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ all-zip-binary:
 all-zip-source:
 	( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) )
 	$(MAKE) -C source/d0_blind_id
-	$(MAKE) -C source/fteqcc
-	$(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/fteqcc/fteqcc.bin
+	$(MAKE) -C source/gmqcc
+	$(MAKE) -C source/qcsrc QCC=$(CURDIR)/source/gmqcc/gmqcc
 	$(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
 	$(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
 	$(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs
@@ -49,8 +49,8 @@ clean-zip-binary:
 
 .PHONY: clean-zip
 clean-zip-source:
-	-$(MAKE) -C source/d0_blind_id distclean
-	$(MAKE) -C source/fteqcc clean
+	$(MAKE) -C source/d0_blind_id distclean
+	$(MAKE) -C source/gmqcc clean
 	$(MAKE) -C source/qcsrc clean
 	$(MAKE) -C source/darkplaces clean
 
@@ -63,7 +63,7 @@ install-data-git: all-git
 	$(RM) -rf $(DESTDIR)$(LIBDIR)/data
 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/data
 	for p in data/*.pk3; do $(INSTALL) $$p $(DESTDIR)$(LIBDIR)/$$p || exit 1; done
-	for p in data/*.pk3dir; do ( cd $$p; $(ZIP) -r $(DESTDIR)$(LIBDIR)/$${p%dir} * ) || exit 1; done
+	for p in data/*.pk3dir; do ( cd $$p && $(ZIP) -r $(DESTDIR)$(LIBDIR)/$${p%dir} * ) || exit 1; done
 
 .PHONY: install-data-zip-binary
 install-data-zip-binary: all-zip-binary
@@ -76,7 +76,7 @@ install-data-zip-source: all-zip-source
 	$(RM) -rf $(DESTDIR)$(LIBDIR)/data
 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/data
 	for p in data/*.pk3; do $(INSTALL) $$p $(DESTDIR)$(LIBDIR)/$$p || exit 1; done
-	for p in data/xonotic-*-data*.pk3; do cd source; $(ZIP) $(DESTDIR)$(LIBDIR)/$$p progs.dat menu.dat csprogs.dat; done
+	for p in data/xonotic-*-data*.pk3; do cd source && $(ZIP) $(DESTDIR)$(LIBDIR)/$$p progs.dat menu.dat csprogs.dat; done
 
 
 .PHONY: install-engine