summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-01-03 00:02:18 +0000
committerrubidium <rubidium@openttd.org>2007-01-03 00:02:18 +0000
commitf337aa1d58702bbf7c1857732c5e0985fc818d34 (patch)
tree29dedd057bb14409b74a4a30bc1695058ef454af
parentb559f1a3765a46b4e0f78ae3a2dcd58f5a1e87d8 (diff)
downloadopenttd-f337aa1d58702bbf7c1857732c5e0985fc818d34.tar.xz
(svn r7782) -Fix (r7779): do really check whether there are files to copy in the directories, not just test whether the directories exist.
-rw-r--r--Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 818e9d00b..8e04a4755 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,10 +171,10 @@ endif
$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BUNDLE_DIR)/media/"
-ifeq ($(shell if test -d "$(BIN_DIR)/scenario"; then echo 1; fi), 1)
+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/"
endif
-ifeq ($(shell if test -d "$(BIN_DIR)/scenario/heightmaps"; then echo 1; fi), 1)
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
endif