From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 21 Apr 2012 13:54:17 +0000 (+0200)
Subject: fix two uses of cd
X-Git-Tag: xonotic-v0.7.0~55^2~41
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f0027569020ff0821eac19d4bcb9c3e17537f1e5;ds=sidebyside

fix two uses of cd
---

diff --git a/Makefile b/Makefile
index 69484068..18861e38 100644
--- a/Makefile
+++ b/Makefile
@@ -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