Remove "$/" shortcut in makefiles

Author: srh

mk/main.mk

@@ -9,9 +9,6 @@
 .PHONY: default-goal
 default-goal: real-default-goal
 
-# $/ is a shorthand for $(TOP)/, without the leading ./
-/ := $(patsubst ./%,%,$(TOP)/)
-
 # check-env.mk provides check-env-start and check-env-check
 include $(TOP)/mk/check-env.mk
 
@@ -30,28 +27,25 @@ include $(TOP)/mk/paths.mk
 # Download and build internal tools like v8 and gperf
 include $(TOP)/mk/support/build.mk
 
-ifeq (Windows,$(OS))
-
 # make install
 include $(TOP)/mk/install.mk
 
+ifeq (Windows,$(OS))
+
 # Windows build
-include $/mk/windows.mk
+include $(TOP)/mk/windows.mk
 
 # Python driver
-include $/drivers/python/build.mk
+include $(TOP)/drivers/python/build.mk
 
 # JavaScript driver
-include $/drivers/javascript/build.mk
+include $(TOP)/drivers/javascript/build.mk
 
 # Build the web assets
 include $(TOP)/admin/build.mk
 
 else # Windows
 
-# make install
-include $(TOP)/mk/install.mk
-
 # Clients drivers
 include $(TOP)/drivers/build.mk
 

mk/packaging.mk

@@ -15,7 +15,7 @@ DEB_CONTROL_ROOT := $(DEB_PACKAGE_DIR)/DEBIAN
 DIST_FILE_LIST_REL := admin demos drivers mk packaging scripts src test
 DIST_FILE_LIST_REL += configure COPYRIGHT Makefile NOTES.md README.md
 
-DIST_FILE_LIST := $(foreach x,$(DIST_FILE_LIST_REL),$/$x)
+DIST_FILE_LIST := $(foreach x,$(DIST_FILE_LIST_REL),$(TOP)/$x)
 
 RETHINKDB_VERSION_DEB := $(subst -,+,$(RETHINKDB_VERSION))~$(PACKAGE_BUILD_NUMBER)$(UBUNTU_RELEASE)$(DEB_RELEASE)
 

mk/support/build.mk

@@ -31,7 +31,7 @@ ifeq (Windows,$(OS))
   PKG_SCRIPT_VARIABLES += DEBUG PLATFORM MSBUILD VCVARSALL CMAKE
 endif
 
-PKG_SCRIPT = $(foreach v, $(PKG_SCRIPT_VARIABLES), $v='$($v)') MAKEFLAGS='$(PKG_MAKEFLAGS)' $/mk/support/pkg/pkg.sh
+PKG_SCRIPT = $(foreach v, $(PKG_SCRIPT_VARIABLES), $v='$($v)') MAKEFLAGS='$(PKG_MAKEFLAGS)' $(TOP)/mk/support/pkg/pkg.sh
 PKG_SCRIPT_TRACE = TRACE=1 $(PKG_SCRIPT)
 PKG_RECURSIVE_MARKER := $(if $(findstring 0,$(JUST_SCAN_MAKEFILES)),$(if $(DRY_RUN),,+))
 

mk/windows.mk

@@ -6,17 +6,17 @@ else
   CONFIGURATION := Release
 endif
 
-$/rethinkdb.vcxproj.xml:
-	test -e $@ || sed "s/RETHINKDB_VERSION/`$/scripts/gen-version.sh`/" < $/mk/rethinkdb.vcxproj.xml > $@
+$(TOP)/rethinkdb.vcxproj.xml:
+	test -e $@ || sed "s/RETHINKDB_VERSION/`$(TOP)/scripts/gen-version.sh`/" < $(TOP)/mk/rethinkdb.vcxproj.xml > $@
 
-$/%.vcxproj $/%-unittest.vcxproj: $/%.vcxproj.xml $/mk/%.vcxproj.xsl
+$(TOP)/%.vcxproj $(TOP)/%-unittest.vcxproj: $(TOP)/%.vcxproj.xml $(TOP)/mk/%.vcxproj.xsl
 	$P GEN
-	cscript /nologo $/mk/gen-vs-project.js
+	cscript /nologo $(TOP)/mk/gen-vs-project.js
 
 .PHONY: windows-all
-windows-all: $/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb.exe
+windows-all: $(TOP)/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb.exe
 ifeq (1,$(DEBUG))
-  windows-all: $/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb-unittest.exe
+  windows-all: $(TOP)/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb-unittest.exe
 endif
 
 SOURCES := $(shell find $(SOURCE_DIR) \( -name '*.cc' -or -name '*.hpp' -or -name '*.tcc' \) -and -not -name '\.*')
@@ -35,11 +35,11 @@ ifneq (1,$(VERBOSE))
   MSBUILD_FLAGS += /verbosity:minimal
 endif
 
-$/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb.exe: $/rethinkdb.vcxproj $(SOURCES_NOUNIT) $(LIB_DEPS) $(PROTO_DEPS)
+$(TOP)/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb.exe: $(TOP)/rethinkdb.vcxproj $(SOURCES_NOUNIT) $(LIB_DEPS) $(PROTO_DEPS)
 	$P MSBUILD
 	"$(MSBUILD)" $(MSBUILD_FLAGS) $<
 
-$/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb-unittest.exe: $/rethinkdb-unittest.vcxproj $(SOURCES) $(LIB_DEPS) $(PROTO_DEPS)
+$(TOP)/build/$(CONFIGURATION)_$(PLATFORM)/rethinkdb-unittest.exe: $(TOP)/rethinkdb-unittest.vcxproj $(SOURCES) $(LIB_DEPS) $(PROTO_DEPS)
 	$P MSBUILD
 	"$(MSBUILD)" $(MSBUILD_FLAGS) $<
 

test/build.mk

@@ -5,7 +5,7 @@ test-deps: $(BUILD_DIR)/rethinkdb $(BUILD_DIR)/rethinkdb-unittest web-assets rb-
 .PHONY: test
 test: test-deps
 	$P RUN-TESTS $(TEST)
-	MAKEFLAGS= $/test/run $(RUN_TEST_ARGS) -b $(BUILD_DIR) $(TEST)
+	MAKEFLAGS= $(TOP)/test/run $(RUN_TEST_ARGS) -b $(BUILD_DIR) $(TEST)
 
 .PHONY: full-test
 full-test: TEST = all