Mercurial > hg > truffle
diff test/Makefile @ 591:a53107650e8b
Merge
author | apangin |
---|---|
date | Sun, 22 Feb 2009 17:11:56 -0800 |
parents | b79faa366fbd |
children | 0fbdb4381b99 |
line wrap: on
line diff
--- a/test/Makefile Sun Feb 15 20:09:02 2009 -0800 +++ b/test/Makefile Sun Feb 22 17:11:56 2009 -0800 @@ -28,9 +28,9 @@ # Get OS/ARCH specifics OSNAME = $(shell uname -s) -SLASH_JAVA = /java ifeq ($(OSNAME), SunOS) PLATFORM = solaris + SLASH_JAVA = /java ARCH = $(shell uname -p) ifeq ($(ARCH), i386) ARCH=i586 @@ -38,6 +38,7 @@ endif ifeq ($(OSNAME), Linux) PLATFORM = linux + SLASH_JAVA = /java ARCH = $(shell uname -m) ifeq ($(ARCH), i386) ARCH = i586 @@ -62,6 +63,10 @@ EXESUFFIX = .exe endif +ifdef ALT_SLASH_JAVA + SLASH_JAVA = $(ALT_SLASH_JAVA) +endif + # Utilities used CD = cd CP = cp