summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 13 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 74e17e3cac..8173c821b4 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,12 @@
ROOT = .
-include $(ROOT)/Makefile.config
+include $(ROOT)/Makefile.import
##############################################################################
# Variables
-# project
-PROJECT_VERSION = $(shell $(TAIL) -1 $(VERSION_FILE))
+# project sources
PROJECT_SOURCES += $(LAMPLIB_SOURCES)
PROJECT_SOURCES += $(META_SOURCES)
PROJECT_SOURCES += $(COMPILER_SOURCES)
@@ -25,10 +24,6 @@ PROJECT_SOURCES += $(DTD2SCALA_SOURCES)
PROJECT_SOURCES += $(SCALAP_SOURCES)
PROJECT_SOURCES += $(SCALATEST_SOURCES)
-# version management
-VERSION_FILE = $(PROJECT_ROOT)/VERSION
-VERSION_SCRIPT = $(PROJECT_SUPPORTDIR)/scripts/version-manager
-
# scala scripts wrapper
SCRIPTS_PREFIX = $(PROJECT_BINARYDIR)
SCRIPTS_WRAPPER = $(SCRIPTS_PREFIX)/.scala_wrapper
@@ -154,10 +149,6 @@ SC_COMPILER = SCALAC
SC_OUTPUTDIR = $(PROJECT_OUTPUTDIR)
SC_CLASSPATH = $(PROJECT_OUTPUTDIR)
-# scala compiler
-SCALAC ?= $(PROJECT_BINARYDIR)/scalac
-SCALADOC ?= $(PROJECT_BINARYDIR)/scaladoc
-
##############################################################################
# Commands
@@ -275,6 +266,17 @@ version-increment :
.PHONY : version-increment
##############################################################################
+# Commands - CVS management
+
+cvs-fix-perms :
+ $(strip \
+ $(FIND) . -type f -perm +a=x | \
+ $(GREP) -v '.*/bin/.*' | \
+ $(XARGS) -r $(CHMOD) a-x)
+
+.PHONY : cvs-fix-perms
+
+##############################################################################
# Targets
.latest-bootstrap :