summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-08-06 14:53:04 +0000
committerpaltherr <paltherr@epfl.ch>2003-08-06 14:53:04 +0000
commit57fdd4109972ddadc83d5dbb23e50993a6359145 (patch)
tree9220c68031663d290dd85cbff250855be254bab6
parent45be55750d9bd0c593033d81414f66e4d6459d4a (diff)
downloadscala-57fdd4109972ddadc83d5dbb23e50993a6359145.tar.gz
scala-57fdd4109972ddadc83d5dbb23e50993a6359145.tar.bz2
scala-57fdd4109972ddadc83d5dbb23e50993a6359145.zip
- Replaced some variables
- Changed some formatting
-rw-r--r--Makefile4
-rw-r--r--doc/reference/Makefile6
-rw-r--r--doc/tutorial/Makefile2
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 27b6842b84..777a438edf 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,7 @@ $(PROJECT_JAR_ARCHIVE) :
##############################################################################
# Includes
-include $(ROOT)/support/make/jc.mk
-include $(ROOT)/support/make/jar.mk
+include $(PROJECT_SUPPORTDIR)/make/jc.mk
+include $(PROJECT_SUPPORTDIR)/make/jar.mk
##############################################################################
diff --git a/doc/reference/Makefile b/doc/reference/Makefile
index bcff1f348a..825128972b 100644
--- a/doc/reference/Makefile
+++ b/doc/reference/Makefile
@@ -6,7 +6,7 @@
##############################################################################
# Configuration
-ROOT = ../..
+ROOT = ../..
include $(ROOT)/Makefile.config
@@ -33,11 +33,11 @@ LATEX_SOURCES += rationale-chapter.tex
# latex
TEXINPUTS := /home/linuxsoft/share/texmf//:$(TEXINPUTS)
-TEXINPUTS := .:$(ROOT)/support/latex:$(TEXINPUTS):
+TEXINPUTS := .:$(PROJECT_SUPPORTDIR)/latex:$(TEXINPUTS):
BIBINPUTS := .
# verbfilter
-VERBFILTER = $(ROOT)/support/latex/verbfilterScala
+VERBFILTER = $(PROJECT_SUPPORTDIR)/latex/verbfilterScala
##############################################################################
# Includes
diff --git a/doc/tutorial/Makefile b/doc/tutorial/Makefile
index b12616373c..58e84e2db4 100644
--- a/doc/tutorial/Makefile
+++ b/doc/tutorial/Makefile
@@ -6,7 +6,7 @@
##############################################################################
# Configuration
-ROOT = ../..
+ROOT = ../..
include $(ROOT)/Makefile.config