--- a/tools/Make.spec	Fri Dec 13 21:37:20 2019 +0100
+++ b/tools/Make.spec	Wed Dec 18 22:52:15 2019 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/tools/Make.spec,v 1.6 2015-03-20 13:29:52 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_tools.
@@ -22,7 +22,7 @@
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
+#  -Dxxx       : defines passed to CC for inline C-code
 #  -Ixxx       : include path passed to CC for inline C-code
 #  +optspace   : optimized for space
 #  +optspace2  : optimized more for space
@@ -80,31 +80,31 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR_SLASH)JavaAbstractSourceHighlighter.$(O) \
-    $(OUTDIR_SLASH)JavaCodeBundleEditor.$(O) \
-    $(OUTDIR_SLASH)JavaCodeLibraryEditor.$(O) \
-    $(OUTDIR_SLASH)JavaCodeLibraryValidationWarning.$(O) \
-    $(OUTDIR_SLASH)JavaCompiler.$(O) \
-    $(OUTDIR_SLASH)JavaLintAnnotation.$(O) \
-    $(OUTDIR_SLASH)JavaLintHighlighter.$(O) \
-    $(OUTDIR_SLASH)JavaLintPopupWindow.$(O) \
-    $(OUTDIR_SLASH)JavaLintService.$(O) \
-    $(OUTDIR_SLASH)JavaListInspectorView.$(O) \
-    $(OUTDIR_SLASH)JavaMapInspectorView.$(O) \
-    $(OUTDIR_SLASH)JavaScannerBase.$(O) \
-    $(OUTDIR_SLASH)JavaSetInspectorView.$(O) \
-    $(OUTDIR_SLASH)JavaSettingsApplication.$(O) \
-    $(OUTDIR_SLASH)JavaSourceDocument.$(O) \
-    $(OUTDIR_SLASH)JavaSourceRef.$(O) \
-    $(OUTDIR_SLASH)JavaToolbox.$(O) \
-    $(OUTDIR_SLASH)stx_libjava_tools.$(O) \
-    $(OUTDIR_SLASH)JavaAbstractLexicalHighlighter.$(O) \
-    $(OUTDIR_SLASH)JavaScanner.$(O) \
-    $(OUTDIR_SLASH)JavaSyntaxHighlighter.$(O) \
-    $(OUTDIR_SLASH)GroovyScanner.$(O) \
-    $(OUTDIR_SLASH)JavaLexicalHighlighter.$(O) \
-    $(OUTDIR_SLASH)GroovySourceHighlighter.$(O) \
-    $(OUTDIR_SLASH)extensions.$(O) \
+    $(OUTDIR)JavaAbstractSourceHighlighter.$(O) \
+    $(OUTDIR)JavaCodeBundleEditor.$(O) \
+    $(OUTDIR)JavaCodeLibraryEditor.$(O) \
+    $(OUTDIR)JavaCodeLibraryValidationWarning.$(O) \
+    $(OUTDIR)JavaCompiler.$(O) \
+    $(OUTDIR)JavaLintAnnotation.$(O) \
+    $(OUTDIR)JavaLintHighlighter.$(O) \
+    $(OUTDIR)JavaLintPopupWindow.$(O) \
+    $(OUTDIR)JavaLintService.$(O) \
+    $(OUTDIR)JavaListInspectorView.$(O) \
+    $(OUTDIR)JavaMapInspectorView.$(O) \
+    $(OUTDIR)JavaScannerBase.$(O) \
+    $(OUTDIR)JavaSetInspectorView.$(O) \
+    $(OUTDIR)JavaSettingsApplication.$(O) \
+    $(OUTDIR)JavaSourceDocument.$(O) \
+    $(OUTDIR)JavaSourceRef.$(O) \
+    $(OUTDIR)JavaToolbox.$(O) \
+    $(OUTDIR)stx_libjava_tools.$(O) \
+    $(OUTDIR)JavaAbstractLexicalHighlighter.$(O) \
+    $(OUTDIR)JavaScanner.$(O) \
+    $(OUTDIR)JavaSyntaxHighlighter.$(O) \
+    $(OUTDIR)GroovyScanner.$(O) \
+    $(OUTDIR)JavaLexicalHighlighter.$(O) \
+    $(OUTDIR)GroovySourceHighlighter.$(O) \
+    $(OUTDIR)extensions.$(O) \