diff --git a/src/Makefile b/src/Makefile
index 140440c9a..47d7f3022 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,7 +33,7 @@ PKGSUBDIRS	= interfaces libs linux modules windows tools drivers doc raceman
 
 src_PKGFILES	= Makefile
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/doc/Makefile b/src/doc/Makefile
index b1e5bc8e3..70a345c9b 100644
--- a/src/doc/Makefile
+++ b/src/doc/Makefile
@@ -17,7 +17,7 @@
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/drivers/Makefile b/src/drivers/Makefile
index a17cc2361..bada1636f 100644
--- a/src/drivers/Makefile
+++ b/src/drivers/Makefile
@@ -23,7 +23,7 @@ PKGSUBDIRS	= $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index 540de88df..ac6f93fe7 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -21,7 +21,7 @@ EXPORTS = $(shell find * -maxdepth 0 -name '*.h' -print)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/Makefile b/src/libs/Makefile
index 7e348e663..ac34e3370 100644
--- a/src/libs/Makefile
+++ b/src/libs/Makefile
@@ -30,7 +30,7 @@ PKGSUBDIRS	= $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}
diff --git a/src/libs/client/Makefile b/src/libs/client/Makefile
index b36a57dc0..f849d679d 100644
--- a/src/libs/client/Makefile
+++ b/src/libs/client/Makefile
@@ -31,7 +31,7 @@ EXPORTS   = client.h exitmenu.h
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/confscreens/Makefile b/src/libs/confscreens/Makefile
index 42eef0155..94c59cde4 100644
--- a/src/libs/confscreens/Makefile
+++ b/src/libs/confscreens/Makefile
@@ -30,7 +30,7 @@ EXPORTS   = confscreens.h driverconfig.h joystickconfig.h mouseconfig.h controlc
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/learning/Makefile b/src/libs/learning/Makefile
index 1ff70cb7e..37ebeda65 100644
--- a/src/libs/learning/Makefile
+++ b/src/libs/learning/Makefile
@@ -28,7 +28,7 @@ EXPDIR       = include/learning
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}
diff --git a/src/libs/math/Makefile b/src/libs/math/Makefile
index a0cafe396..e6796375b 100644
--- a/src/libs/math/Makefile
+++ b/src/libs/math/Makefile
@@ -28,7 +28,7 @@ EXPDIR       = include/tmath
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}
diff --git a/src/libs/portability/Makefile b/src/libs/portability/Makefile
index 488e9838e..9bef01380 100644
--- a/src/libs/portability/Makefile
+++ b/src/libs/portability/Makefile
@@ -28,7 +28,7 @@ EXPDIR       = include
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}
diff --git a/src/libs/raceengineclient/Makefile b/src/libs/raceengineclient/Makefile
index 7f20f20fe..9b2452f94 100644
--- a/src/libs/raceengineclient/Makefile
+++ b/src/libs/raceengineclient/Makefile
@@ -38,7 +38,7 @@ CONFIG    = $(SHIP)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}
diff --git a/src/libs/racescreens/Makefile b/src/libs/racescreens/Makefile
index c4f1c2a36..8b384bc27 100644
--- a/src/libs/racescreens/Makefile
+++ b/src/libs/racescreens/Makefile
@@ -28,7 +28,7 @@ EXPORTS   = racescreens.h
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/robottools/Makefile b/src/libs/robottools/Makefile
index 46e9a5aa0..1017c0949 100644
--- a/src/libs/robottools/Makefile
+++ b/src/libs/robottools/Makefile
@@ -28,7 +28,7 @@ EXPORTS = robottools.h
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/tgf/Makefile b/src/libs/tgf/Makefile
index b7e85358f..a30cb92a0 100644
--- a/src/libs/tgf/Makefile
+++ b/src/libs/tgf/Makefile
@@ -40,7 +40,7 @@ SHIP    = params.dtd
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/tgfclient/Makefile b/src/libs/tgfclient/Makefile
index 8e8261f90..184352a2f 100644
--- a/src/libs/tgfclient/Makefile
+++ b/src/libs/tgfclient/Makefile
@@ -53,7 +53,7 @@ CONFIG    = screen.xml
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/txml/Makefile b/src/libs/txml/Makefile
index b3279130d..bd904a98d 100644
--- a/src/libs/txml/Makefile
+++ b/src/libs/txml/Makefile
@@ -34,7 +34,7 @@ PKGSUBDIRS	= gennmtab
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/libs/txml/gennmtab/Makefile b/src/libs/txml/gennmtab/Makefile
index ad0c98d46..9ae76d59c 100644
--- a/src/libs/txml/gennmtab/Makefile
+++ b/src/libs/txml/gennmtab/Makefile
@@ -26,7 +26,7 @@ SOURCES = gennmtab.c
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 784464199..bf3469d5f 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -25,7 +25,7 @@ PKGSUBDIRS	= track simu graphic telemetry
 
 src_PKGFILES	= Makefile
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/graphic/Makefile b/src/modules/graphic/Makefile
index 30b75f702..c9fb43cbc 100644
--- a/src/modules/graphic/Makefile
+++ b/src/modules/graphic/Makefile
@@ -26,7 +26,7 @@ PKGSUBDIRS	= $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/graphic/ssggraph/Makefile b/src/modules/graphic/ssggraph/Makefile
index b5e96ef69..412869f64 100644
--- a/src/modules/graphic/ssggraph/Makefile
+++ b/src/modules/graphic/ssggraph/Makefile
@@ -36,7 +36,7 @@ CONFIG    = $(SHIP)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/simu/Makefile b/src/modules/simu/Makefile
index 1199c9ed1..42ba00077 100644
--- a/src/modules/simu/Makefile
+++ b/src/modules/simu/Makefile
@@ -27,6 +27,6 @@ PKGSUBDIRS	= $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
diff --git a/src/modules/simu/simuv2/Makefile b/src/modules/simu/simuv2/Makefile
index 81e1c8235..7e64ebce1 100644
--- a/src/modules/simu/simuv2/Makefile
+++ b/src/modules/simu/simuv2/Makefile
@@ -45,7 +45,7 @@ PKGSUBDIRS	= $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/simu/simuv2/SOLID-2.0/Makefile b/src/modules/simu/simuv2/SOLID-2.0/Makefile
index b96b8fa57..b94a1efa7 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/Makefile
+++ b/src/modules/simu/simuv2/SOLID-2.0/Makefile
@@ -25,7 +25,7 @@ PKGSUBDIRS	= $(SUBDIRS) $(EXPINCDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/simu/simuv2/SOLID-2.0/include/3D/Makefile b/src/modules/simu/simuv2/SOLID-2.0/include/3D/Makefile
index 960820ce0..c08686274 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/include/3D/Makefile
+++ b/src/modules/simu/simuv2/SOLID-2.0/include/3D/Makefile
@@ -23,7 +23,7 @@ EXPDIR       = include/3D
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/simu/simuv2/SOLID-2.0/include/Makefile b/src/modules/simu/simuv2/SOLID-2.0/include/Makefile
index 4b90e938b..a8aebcb26 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/include/Makefile
+++ b/src/modules/simu/simuv2/SOLID-2.0/include/Makefile
@@ -23,7 +23,7 @@ PKGSUBDIRS	= $(EXPINCDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/Makefile b/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/Makefile
index 818faf199..69383858e 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/Makefile
+++ b/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/Makefile
@@ -23,7 +23,7 @@ EXPDIR       = include/SOLID
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}
diff --git a/src/modules/simu/simuv2/SOLID-2.0/src/Makefile b/src/modules/simu/simuv2/SOLID-2.0/src/Makefile
index f66f9e90d..c2b18a135 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Makefile
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Makefile
@@ -29,7 +29,7 @@ COMPILFLAGS  =	-DNDEBUG -Wno-deprecated
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/simu/simuv3/Makefile b/src/modules/simu/simuv3/Makefile
index 8ed7f9174..ff4770156 100644
--- a/src/modules/simu/simuv3/Makefile
+++ b/src/modules/simu/simuv3/Makefile
@@ -40,7 +40,7 @@ LIBS		=  -lplibsg -lplibul -L${EXPORTBASE}/lib -lsolid
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/telemetry/Makefile b/src/modules/telemetry/Makefile
index aca045ac0..93de76c86 100644
--- a/src/modules/telemetry/Makefile
+++ b/src/modules/telemetry/Makefile
@@ -28,7 +28,7 @@ SHIP      = telemetry.sh
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/modules/track/Makefile b/src/modules/track/Makefile
index 3d7616a4c..16f7e320a 100644
--- a/src/modules/track/Makefile
+++ b/src/modules/track/Makefile
@@ -24,7 +24,7 @@ SOURCES   = track.cpp trackitf.cpp trackutil.cpp track3.cpp track4.cpp
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/raceman/Makefile b/src/raceman/Makefile
index 7b603b9b0..cbd0e9ac3 100644
--- a/src/raceman/Makefile
+++ b/src/raceman/Makefile
@@ -28,7 +28,7 @@ CONFIG = ${SHIP}
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 0de3d703a..52adb888e 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -25,7 +25,7 @@ PKGSUBDIRS	=  $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/tools/accc/Makefile b/src/tools/accc/Makefile
index 1462da74c..e8f183d5f 100644
--- a/src/tools/accc/Makefile
+++ b/src/tools/accc/Makefile
@@ -33,7 +33,7 @@ SOLIBS		= -ltgf -lplibssg -lplibsg -lplibul -ltxml
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/tools/nfs2ac/Makefile b/src/tools/nfs2ac/Makefile
index fa85f65ef..5fd2f1b29 100644
--- a/src/tools/nfs2ac/Makefile
+++ b/src/tools/nfs2ac/Makefile
@@ -24,7 +24,7 @@ SOURCES		= mainnfs2ac.cpp
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/tools/nfsperf/Makefile b/src/tools/nfsperf/Makefile
index cb3c301cc..a9f331ac6 100644
--- a/src/tools/nfsperf/Makefile
+++ b/src/tools/nfsperf/Makefile
@@ -28,7 +28,7 @@ SOLIBS		= -ltgf -ltxml
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/tools/package/Makefile b/src/tools/package/Makefile
index b5453f5d5..cd9e60e98 100644
--- a/src/tools/package/Makefile
+++ b/src/tools/package/Makefile
@@ -22,7 +22,7 @@ PKGSUBDIRS     = $(SUBDIRS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/tools/texmapper/Makefile b/src/tools/texmapper/Makefile
index 24dee73a8..5003db199 100644
--- a/src/tools/texmapper/Makefile
+++ b/src/tools/texmapper/Makefile
@@ -28,6 +28,6 @@ SOLIBS    	= -lplibssg -lplibsg -lplibul -ltgf -ltgfclient -ltxml -lpng
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
diff --git a/src/tools/trackgen/Makefile b/src/tools/trackgen/Makefile
index 032fe4e71..598dc64d6 100644
--- a/src/tools/trackgen/Makefile
+++ b/src/tools/trackgen/Makefile
@@ -33,7 +33,7 @@ SOLIBS       	= -ltgf -ltgfclient -lplibssg -lplibsg -lplibul -lrobottools -ltxm
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/Makefile b/src/windows/Makefile
index 86e440168..af14c490c 100644
--- a/src/windows/Makefile
+++ b/src/windows/Makefile
@@ -20,7 +20,7 @@ PKGSUBDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/dll/Makefile b/src/windows/dll/Makefile
index 602976094..a54570b06 100644
--- a/src/windows/dll/Makefile
+++ b/src/windows/dll/Makefile
@@ -19,7 +19,7 @@
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/include/AL/Makefile b/src/windows/include/AL/Makefile
index f9463587c..d151a763a 100644
--- a/src/windows/include/AL/Makefile
+++ b/src/windows/include/AL/Makefile
@@ -18,7 +18,7 @@
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/include/GL/Makefile b/src/windows/include/GL/Makefile
index d4b1430fe..2a3b1834e 100644
--- a/src/windows/include/GL/Makefile
+++ b/src/windows/include/GL/Makefile
@@ -18,7 +18,7 @@
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/include/Makefile b/src/windows/include/Makefile
index 2dfcff61e..adb0e280b 100644
--- a/src/windows/include/Makefile
+++ b/src/windows/include/Makefile
@@ -20,7 +20,7 @@ PKGSUBDIRS	= $(shell find * -maxdepth 0 -type d -print | grep -v CVS)
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/include/plib/Makefile b/src/windows/include/plib/Makefile
index d4b1430fe..2a3b1834e 100644
--- a/src/windows/include/plib/Makefile
+++ b/src/windows/include/plib/Makefile
@@ -18,7 +18,7 @@
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 include ${MAKE_DEFAULT}
 
diff --git a/src/windows/lib/Makefile b/src/windows/lib/Makefile
index 4e73a5d01..823a08c24 100644
--- a/src/windows/lib/Makefile
+++ b/src/windows/lib/Makefile
@@ -19,7 +19,7 @@
 
 src_PKGFILES	= $(shell find * -maxdepth 0 -type f -print)
 
-src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS_BASE},,$(shell pwd))
+src_PKGDIR	= ${PACKAGE}-${VERSION}/$(subst ${TORCS-NG_BASE},,$(shell pwd))
 
 
 include ${MAKE_DEFAULT}