From 9c325bab1e7ed7d305a79ef9e366b6ac87b8b1b6 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 8 Sep 2008 22:46:18 +0000 Subject: [PATCH] Use test -f rather than test -e Hopefully this will fix the SunOS builbot slave. --- Makefile | 2 +- compiler/Makefile | 2 +- driver/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 75106d9..b42b21c 100644 --- a/Makefile +++ b/Makefile @@ -564,7 +564,7 @@ hc-file-bundle : ghc-$(ProjectVersion)/libraries -follow \ \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \ - if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \ + if test "x$$f" != "x" && test -f `echo "$$f" | sed 's/hsc$$/hs/g'`; then \ echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \ fi; \ done; diff --git a/compiler/Makefile b/compiler/Makefile index 8dced37..6ea209b 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -174,7 +174,7 @@ CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS) boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y - test -e $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF) + test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF) $(CABAL) configure --distpref dist-stage$* \ $(CONFIGURE_FLAGS_STAGE$*) \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ diff --git a/driver/Makefile b/driver/Makefile index 3fcb4be..7e87b89 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -15,7 +15,7 @@ INPLACE_FILE = $(INPLACE_DATA_DIR)/inplace boot all :: $(MKDIRHIER) $(INPLACE_DATA_DIR) - test -e $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_CONF) + test -f $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_CONF) touch $(INPLACE_FILE) INSTALL_DATAS += ghc-usage.txt ghci-usage.txt -- 1.7.10.4