From 6d8c478d5c0d84e5087aa3abaa439e796bb68ea9 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 21 Feb 2017 16:09:38 +0100
Subject: [PATCH] some perfectionistic refactoring of makefiles

---
 aaccess2/makefile               | 22 ++++++++---------
 aarbology2/makefile             | 22 ++++++++---------
 acast2/makefile                 | 22 ++++++++---------
 acompaction2/makefile           | 22 ++++++++---------
 acompare2/makefile              | 22 ++++++++---------
 aconversions2/makefile          | 22 ++++++++---------
 aconvert2/makefile              | 22 ++++++++---------
 aderivation2/makefile           | 22 ++++++++---------
 adeterminize2/makefile          | 22 ++++++++---------
 aecho2/makefile                 | 22 ++++++++---------
 aepsilon2/makefile              | 22 ++++++++---------
 agenerate2/makefile             | 22 ++++++++---------
 aintegral2/makefile             | 22 ++++++++---------
 alangop2/makefile               | 22 ++++++++---------
 alib2algo/makefile              | 42 ++++++++++++++++-----------------
 alib2algo_experimental/makefile | 42 ++++++++++++++++-----------------
 alib2common/makefile            | 42 ++++++++++++++++-----------------
 alib2data/makefile              | 42 ++++++++++++++++-----------------
 alib2data_experimental/makefile | 42 ++++++++++++++++-----------------
 alib2elgo/makefile              | 42 ++++++++++++++++-----------------
 alib2measurepp/makefile         | 42 ++++++++++++++++-----------------
 alib2raw/makefile               | 42 ++++++++++++++++-----------------
 alib2std/makefile               | 42 ++++++++++++++++-----------------
 alib2str/makefile               | 42 ++++++++++++++++-----------------
 alib2str_experimental/makefile  | 42 ++++++++++++++++-----------------
 ameasure2/makefile              | 22 ++++++++---------
 ameasurep2/makefile             | 22 ++++++++---------
 aminimize2/makefile             | 22 ++++++++---------
 anormalize2/makefile            | 22 ++++++++---------
 aquery2/makefile                | 22 ++++++++---------
 arand2/makefile                 | 22 ++++++++---------
 araw2/makefile                  | 22 ++++++++---------
 arename2/makefile               | 22 ++++++++---------
 areverse2/makefile              | 22 ++++++++---------
 arun2/makefile                  | 22 ++++++++---------
 astat2/makefile                 | 22 ++++++++---------
 astringology2/makefile          | 22 ++++++++---------
 atrim2/makefile                 | 22 ++++++++---------
 tniceprint/makefile             | 22 ++++++++---------
 39 files changed, 539 insertions(+), 539 deletions(-)

diff --git a/aaccess2/makefile b/aaccess2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aaccess2/makefile
+++ b/aaccess2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aarbology2/makefile b/aarbology2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aarbology2/makefile
+++ b/aarbology2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/acast2/makefile b/acast2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/acast2/makefile
+++ b/acast2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/acompaction2/makefile b/acompaction2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/acompaction2/makefile
+++ b/acompaction2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/acompare2/makefile b/acompare2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/acompare2/makefile
+++ b/acompare2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aconversions2/makefile b/aconversions2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aconversions2/makefile
+++ b/aconversions2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aconvert2/makefile b/aconvert2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aconvert2/makefile
+++ b/aconvert2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aderivation2/makefile b/aderivation2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aderivation2/makefile
+++ b/aderivation2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/adeterminize2/makefile b/adeterminize2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/adeterminize2/makefile
+++ b/adeterminize2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aecho2/makefile b/aecho2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aecho2/makefile
+++ b/aecho2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aepsilon2/makefile b/aepsilon2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aepsilon2/makefile
+++ b/aepsilon2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/agenerate2/makefile b/agenerate2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/agenerate2/makefile
+++ b/agenerate2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aintegral2/makefile b/aintegral2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aintegral2/makefile
+++ b/aintegral2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/alangop2/makefile b/alangop2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/alangop2/makefile
+++ b/alangop2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/alib2algo/makefile b/alib2algo/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2algo/makefile
+++ b/alib2algo/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2algo_experimental/makefile b/alib2algo_experimental/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2algo_experimental/makefile
+++ b/alib2algo_experimental/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2common/makefile b/alib2common/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2common/makefile
+++ b/alib2common/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2data/makefile b/alib2data/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2data/makefile
+++ b/alib2data/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2data_experimental/makefile b/alib2data_experimental/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2data_experimental/makefile
+++ b/alib2data_experimental/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2elgo/makefile b/alib2elgo/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2elgo/makefile
+++ b/alib2elgo/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2measurepp/makefile b/alib2measurepp/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2measurepp/makefile
+++ b/alib2measurepp/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2raw/makefile b/alib2raw/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2raw/makefile
+++ b/alib2raw/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2std/makefile b/alib2std/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2std/makefile
+++ b/alib2std/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2str/makefile b/alib2str/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2str/makefile
+++ b/alib2str/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/alib2str_experimental/makefile b/alib2str_experimental/makefile
index bf9f76e926..affb6d2eb1 100644
--- a/alib2str_experimental/makefile
+++ b/alib2str_experimental/makefile
@@ -20,11 +20,11 @@ TEST_LDFLAGS_DEBUG:=-Wl,-no-as-needed -Llib-debug $(addprefix -L, $(addsuffix li
 LDFLAGS_RELEASE:=-rdynamic -shared
 TEST_LDFLAGS_RELEASE:=-Wl,-no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
-TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp,test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
-TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp,test-obj-release/%.o, $(shell find test-src/ -name *cpp))
 
 .PHONY: all debug release clean build-debug build-release clean-debug clean-release doc
 
@@ -38,10 +38,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -98,10 +98,10 @@ FORCE:
 
 lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -109,10 +109,10 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -120,10 +120,10 @@ lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 
 test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -131,10 +131,10 @@ test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-
 
 test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -170,10 +170,10 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/
 # main targets
 
 debug: test-bin-debug/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN)
 
 release: test-bin-release/$(TESTBIN)
-	LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
+	LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN)
 
 clean: clean-debug clean-release
 	$(RM) -r doc
diff --git a/ameasure2/makefile b/ameasure2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/ameasure2/makefile
+++ b/ameasure2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/ameasurep2/makefile b/ameasurep2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/ameasurep2/makefile
+++ b/ameasurep2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aminimize2/makefile b/aminimize2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aminimize2/makefile
+++ b/aminimize2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/anormalize2/makefile b/anormalize2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/anormalize2/makefile
+++ b/anormalize2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/aquery2/makefile b/aquery2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/aquery2/makefile
+++ b/aquery2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/arand2/makefile b/arand2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/arand2/makefile
+++ b/arand2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/araw2/makefile b/araw2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/araw2/makefile
+++ b/araw2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/arename2/makefile b/arename2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/arename2/makefile
+++ b/arename2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/areverse2/makefile b/areverse2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/areverse2/makefile
+++ b/areverse2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/arun2/makefile b/arun2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/arun2/makefile
+++ b/arun2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/astat2/makefile b/astat2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/astat2/makefile
+++ b/astat2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/astringology2/makefile b/astringology2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/astringology2/makefile
+++ b/astringology2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/atrim2/makefile b/atrim2/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/atrim2/makefile
+++ b/atrim2/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
diff --git a/tniceprint/makefile b/tniceprint/makefile
index a28dfa12ae..ab3f851a72 100644
--- a/tniceprint/makefile
+++ b/tniceprint/makefile
@@ -15,9 +15,9 @@ LDFLAGS_DEBUG:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-debug, $(LINK_P
 
 LDFLAGS_RELEASE:=-Wl,-no-as-needed $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic $(addprefix -l, $(LINK_LIBRARIES)) -Wl,-rpath,.
 
-OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
 
-OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(shell find src/ -name *cpp))
+OBJECTS_RELEASE:=$(patsubst src/%.cpp,obj-release/%.o, $(shell find src/ -name *cpp))
 
 .PHONY: all build-debug clean-debug doc
 
@@ -31,10 +31,10 @@ FORCE:
 
 %/makefile: makefile makefile.conf
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -91,10 +91,10 @@ FORCE:
 
 bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
@@ -102,10 +102,10 @@ bin-debug/$(EXECUTABLE): obj-debug/ $(OBJECTS_DEBUG)
 
 bin-release/$(EXECUTABLE): obj-release/ $(OBJECTS_RELEASE)
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\
+		ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /,, $(dir $@)) 2>/dev/null;\
 	fi;\
-	if [ -L $(subst /, , $(dir $@)) ]; then\
-		mkdir -p `readlink $(subst /, , $(dir $@))`;\
+	if [ -L $(subst /,, $(dir $@)) ]; then\
+		mkdir -p `readlink $(subst /,, $(dir $@))`;\
 	else\
 		mkdir -p $(dir $@);\
 	fi
-- 
GitLab