summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorschinz <schinz@epfl.ch>2004-10-04 08:28:13 +0000
committerschinz <schinz@epfl.ch>2004-10-04 08:28:13 +0000
commitfa2236790ccfb7b8c6345488fc3e20004f73278b (patch)
tree82f63aa7cbe651d37668964e09495475c3190853 /Makefile
parent57d20057ab1ef6f4f9e9d52c0a686b95b2c4d72f (diff)
downloadscala-fa2236790ccfb7b8c6345488fc3e20004f73278b.tar.gz
scala-fa2236790ccfb7b8c6345488fc3e20004f73278b.tar.bz2
scala-fa2236790ccfb7b8c6345488fc3e20004f73278b.zip
- changed the definition of "ROOT" to make it w...
- changed the definition of "ROOT" to make it work on OS/X
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8bf956d895..3212628f33 100644
--- a/Makefile
+++ b/Makefile
@@ -298,7 +298,7 @@ $(SCRIPTS_ALIASES_FILES): $(SCRIPTS_WRAPPER_FILE)
$(call RUN,$(LN) -s $(notdir $(SCRIPTS_WRAPPER_FILE)) $@); \
fi
-$(SCRIPTS_WRAPPER_FILE) : ROOT := $(shell cd $(ROOT); pwd)
+$(SCRIPTS_WRAPPER_FILE) : ROOT := $(shell cd $(ROOT) && pwd)
$(SCRIPTS_WRAPPER_FILE) : MACRO_VERSION ?= $(PROJECT_VERSION)
$(SCRIPTS_WRAPPER_FILE) : MACRO_LIBRARY_SOURCES ?= $(PROJECT_SOURCEDIR)
$(SCRIPTS_WRAPPER_FILE) : MACRO_LIBRARY_CLASSES ?= $(LIBRARY_CLASSDIR)