summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-01-15 18:49:06 +0000
committerrubidium <rubidium@openttd.org>2009-01-15 18:49:06 +0000
commite61008d6c0e7bac8a173f2e0696f9f5f191644eb (patch)
treea39e8db7765809b80b5d89ec79569fb4fda7213c
parent555037b623a4d285a1e08d11139f59de733f48dc (diff)
downloadopenttd-e61008d6c0e7bac8a173f2e0696f9f5f191644eb.tar.xz
(svn r15098) -Fix [FS#2535]: MinGW's find didn't remove the .svn directories during bundling as we told it to, so we're using a slightly different approach that seems to work
-rw-r--r--Makefile.bundle.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 433a63396..0800c8450 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -78,7 +78,7 @@ ifdef MENU_DIR
endif
ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/ai/\"* 2>/dev/null`"; then echo 1; fi), 1)
$(Q)cp -R "$(BIN_DIR)/ai/"* "$(BUNDLE_DIR)/ai/"
- $(Q)find $(BUNDLE_DIR)/ai/ -depth -iname '*.svn' -exec rm -Rf {} \; || find $(BUNDLE_DIR)/ai/ -d -iname '*.svn' -exec rm -Rf {} \;
+ $(Q)find $(BUNDLE_DIR)/ai/ -type d -iname '.svn' | xargs rm -Rf
endif
ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
$(Q)cp "$(BIN_DIR)/scenario/"*.scn "$(BUNDLE_DIR)/scenario/"