From b7dd9ed9a234211df2eb592ce96b1f7de9d88165 Mon Sep 17 00:00:00 2001
From: paltherr <paltherr@epfl.ch>
Date: Mon, 18 Aug 2003 16:50:08 +0000
Subject: - made some makefile scripts a bit more robust ...

- made some makefile scripts a bit more robust to filenames containing
- $s reenabled generation of scala documentation
---
 support/make/cygwin.mk | 4 ++--
 support/make/grep.mk   | 2 +-
 support/make/jc.mk     | 2 +-
 support/make/sc.mk     | 2 +-
 support/make/sdc.mk    | 2 +-
 support/make/wc.mk     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'support/make')

diff --git a/support/make/cygwin.mk b/support/make/cygwin.mk
index 5b13f6b14b..2fc301ea09 100644
--- a/support/make/cygwin.mk
+++ b/support/make/cygwin.mk
@@ -26,7 +26,7 @@ CYGWIN_TEST		 = $(filter CYGWIN%,$(shell $(UNAME)))
 ##############################################################################
 # Functions
 
-CYGWIN_PATH		 = $(if $(CYGWIN_TEST),`$(CYGPATH) -w -p '$(1)'`,$(1))
-CYGWIN_FILE		 = $(if $(CYGWIN_TEST),`$(CYGPATH) -w    '$(1)'`,$(1))
+CYGWIN_PATH		 = $(if $(CYGWIN_TEST),`$(CYGPATH) -w -p $(1)`,$(1))
+CYGWIN_FILE		 = $(if $(CYGWIN_TEST),`$(CYGPATH) -w    $(1)`,$(1))
 
 ##############################################################################
diff --git a/support/make/grep.mk b/support/make/grep.mk
index 37149fe224..d8c9c66498 100644
--- a/support/make/grep.mk
+++ b/support/make/grep.mk
@@ -44,7 +44,7 @@ grep		:
 	       "$(MAKE) $@ [FLAGS=<flags>] REGEX=<regex> [FILES=<files>]";\
 	    exit 1; \
 	fi
-	@$(GREP_BINARY) $(GREP_FLAGS) '$(GREP_REGEX)' $(GREP_FILES)
+	@$(GREP_BINARY) $(GREP_FLAGS) '$(GREP_REGEX)' $(GREP_FILES:%='%')
 
 .PHONY		: grep
 
diff --git a/support/make/jc.mk b/support/make/jc.mk
index 80a406428d..5692535568 100644
--- a/support/make/jc.mk
+++ b/support/make/jc.mk
@@ -91,7 +91,7 @@ jc			+= $(jc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%))
 jc			+= $(jc_ENCODING:%=-encoding %)
 jc			+= $(jc_SOURCE:%=-source %)
 jc			+= $(jc_TARGET:%=-target %)
-jc			+= $(jc_FILES:%=$(call CYGWIN_FILE,%))
+jc			+= $(jc_FILES:%=$(call CYGWIN_FILE,'%'))
 
 ##############################################################################
 # Functions
diff --git a/support/make/sc.mk b/support/make/sc.mk
index 823db89382..edf861bd5e 100644
--- a/support/make/sc.mk
+++ b/support/make/sc.mk
@@ -91,7 +91,7 @@ sc			+= $(sc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%))
 sc			+= $(sc_ENCODING:%=-encoding %)
 sc			+= $(sc_SOURCE:%=-source %)
 sc			+= $(sc_TARGET:%=-target %)
-sc			+= $(sc_FILES:%=$(call CYGWIN_FILE,%))
+sc			+= $(sc_FILES:%=$(call CYGWIN_FILE,'%'))
 
 ##############################################################################
 # Functions
diff --git a/support/make/sdc.mk b/support/make/sdc.mk
index 5c9601d790..41f07276be 100644
--- a/support/make/sdc.mk
+++ b/support/make/sdc.mk
@@ -91,7 +91,7 @@ sdc			+= $(sdc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%))
 sdc			+= $(sdc_ENCODING:%=-encoding %)
 sdc			+= $(sdc_SOURCE:%=-source %)
 sdc			+= $(sdc_TARGET:%=-target %)
-sdc			+= $(sdc_FILES:%=$(call CYGWIN_FILE,%))
+sdc			+= $(sdc_FILES:%=$(call CYGWIN_FILE,'%'))
 
 ##############################################################################
 # Functions
diff --git a/support/make/wc.mk b/support/make/wc.mk
index 744920939d..e273544f48 100644
--- a/support/make/wc.mk
+++ b/support/make/wc.mk
@@ -38,7 +38,7 @@ WC_FILES		?= $(if $(FILES),$(FILES),$(PROJECT_SOURCES))
 # Rules
 
 wc		:
-	@$(WC_BINARY) $(WC_FLAGS) $(WC_FILES)
+	@$(WC_BINARY) $(WC_FLAGS) $(WC_FILES:%='%')
 
 .PHONY		: wc
 
-- 
cgit v1.2.3