Mercurial > hg > openjdk > jdk6 > langtools

changeset 102:e7e6982abb38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jjg
date Fri, 18 Jun 2010 21:24:04 -0700
parents 08e8b05e3770 (current diff) 0e4ccb5a0d40 (diff)
children 1f8b3cc0489d
files
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/Makefile	Tue Mar 31 11:16:15 2009 -0700
+++ b/make/Makefile	Fri Jun 18 21:24:04 2010 -0700
@@ -40,15 +40,16 @@
 
 SYSTEM_UNAME := $(shell uname)
 
+# Where is unwanted output to be delivered?
+# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
 ifeq ($(SYSTEM_UNAME), Windows_NT)
 DEV_NULL = NUL
 else
+DEV_NULL = /dev/null 
+endif
+
 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-DEV_NULL = NUL
 USING_CYGWIN = true
-else
-DEV_NULL = /dev/null
-endif 
 endif
 
 ifdef USING_CYGWIN