From f337aa1d58702bbf7c1857732c5e0985fc818d34 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 3 Jan 2007 00:02:18 +0000 Subject: (svn r7782) -Fix (r7779): do really check whether there are files to copy in the directories, not just test whether the directories exist. --- Makefile.in | 4 ++-- 1 file 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 -- cgit v1.2.3-70-g09d2