diff --git a/src/common/common.pro b/src/common/common.pro
index 2c2726de2..e973d6957 100644
--- a/src/common/common.pro
+++ b/src/common/common.pro
@@ -76,13 +76,13 @@ SOURCES += \
     ml_selection_buffers.cpp
 
 macx:QMAKE_POST_LINK = "\
-    if [ -d  $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS/ ]; \
+    if [ -d  $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS/ ]; \
     then  \
         echo "Copying";  \
     else  \
-        mkdir -p $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS;  \
+        mkdir -p $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS;  \
     fi;   \
-    cp $${MESHLAB_DISTRIB_DIRECTORY}/lib/libcommon.* $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS/ ;\
+    cp $$MESHLAB_DISTRIB_DIRECTORY/lib/libcommon.* $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS/ ;\
 #    if [ -d ../external/ ];\
 #    then \
 #        echo "ok external dir exists"; \
@@ -90,7 +90,7 @@ macx:QMAKE_POST_LINK = "\
 #        ln -s ../../meshlab/src/external ../external;\
 #        echo "linked external dir"; \
 #    fi;\
-#    if [ -d $${MESHLAB_DISTRIB_DIRECTORY}/shaders/ ];\
+#    if [ -d $$MESHLAB_DISTRIB_DIRECTORY/shaders/ ];\
 #    then \
 #        echo "ok shader dir exists"; \
 #    else \
diff --git a/src/general.pri b/src/general.pri
index 62aa273ed..513be1f57 100644
--- a/src/general.pri
+++ b/src/general.pri
@@ -31,8 +31,8 @@ CONFIG(system_eigen3): EIGENDIR = /usr/include/eigen3
 win32:DEFINES += NOMINMAX
 
 # Set up library search paths
-win32-msvc:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
-win32-gcc:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
+win32-msvc:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc -L$$MESHLAB_DISTRIB_DIRECTORY/lib
+win32-gcc:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc -L$$MESHLAB_DISTRIB_DIRECTORY/lib
 
 
 ######## MACOS SETTINGS ##########
@@ -50,7 +50,7 @@ macx:QMAKE_CXXFLAGS += -Xpreprocessor -fopenmp
 macx:QMAKE_LFLAGS += -lomp
 
 # Set up library search paths
-macx:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64 -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
+macx:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/macx64 -L$$MESHLAB_DISTRIB_DIRECTORY/lib
 
 
 ######## LINUX SETTINGS ##########
@@ -58,6 +58,6 @@ macx:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64 -L$${MESHLAB_DIST
 linux-g++:QMAKE_CXXFLAGS+=-Wno-unknown-pragmas
 
 # Set up library search paths
-linux:QMAKE_RPATHDIR += $${MESHLAB_DISTRIB_DIRECTORY}/lib
-linux:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/linux -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
-linux-g++:QMAKE_LFLAGS+= -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/linux-g++ -L$${MESHLAB_DISTRIB_DIRECTORY}/lib
+linux:QMAKE_RPATHDIR += $$MESHLAB_DISTRIB_DIRECTORY/lib
+linux:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -L$$MESHLAB_DISTRIB_DIRECTORY/lib
+linux-g++:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -L$$MESHLAB_DISTRIB_DIRECTORY/lib
diff --git a/src/meshlab.pro b/src/meshlab.pro
index c329d0865..7beeb1685 100644
--- a/src/meshlab.pro
+++ b/src/meshlab.pro
@@ -113,7 +113,7 @@ SUBDIRS += \
     sampleplugins/sample_filtergpu
 }
 
-!equals(PWD, $${OUT_PWD}) {
+!equals(PWD, $$OUT_PWD) {
 
 !meshlab_mini{
     #copying the "plugins" folder inside the build directory/distrib
diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
index aca396052..7a5e3f0bb 100644
--- a/src/meshlab/meshlab.pro
+++ b/src/meshlab/meshlab.pro
@@ -120,20 +120,20 @@ win32:DEFINES += NOMINMAX
 CONFIG += stl
 
 win32-msvc:LIBS += \
-    -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc -ljhead \
-    -L$${MESHLAB_DISTRIB_DIRECTORY}/lib -lcommon -lopengl32 -lGLU32
+    -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc -ljhead \
+    -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lcommon -lopengl32 -lGLU32
 
 win32-g++:LIBS += \
-    -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -ljhead \
-    -L$${MESHLAB_DISTRIB_DIRECTORY}/lib -lcommon -lopengl32 -lGLU32
+    -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc -ljhead \
+    -L$$MESHLAB_DISTRIB_DIRECTORY/lib -lcommon -lopengl32 -lGLU32
 
 macx:LIBS += \
-    -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64 -ljhead \
-    $${MESHLAB_DISTRIB_DIRECTORY}/lib/libcommon.dylib
+    -L$$MESHLAB_DISTRIB_DIRECTORY/lib/macx64 -ljhead \
+    $$MESHLAB_DISTRIB_DIRECTORY/lib/libcommon.dylib
 
 macx:QMAKE_POST_LINK = "\
-    cp -P $${MESHLAB_DISTRIB_DIRECTORY}/lib/libcommon.1.dylib $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS; \
-    install_name_tool -change libcommon.1.dylib @executable_path/libcommon.1.dylib $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS/meshlab \
+    cp -P $$MESHLAB_DISTRIB_DIRECTORY/lib/libcommon.1.dylib $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS; \
+    install_name_tool -change libcommon.1.dylib @executable_path/libcommon.1.dylib $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS/meshlab \
     "
 
 #CONFIG(release,debug | release) {
@@ -144,7 +144,7 @@ macx:QMAKE_POST_LINK = "\
 
 linux:LIBS += \
     -lcommon -lGLU \
-    -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/linux-g++ -ljhead
+    -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -ljhead
 
 !CONFIG(system_glew) {
 	INCLUDEPATH *= $$GLEWDIR/include
diff --git a/src/meshlabplugins/edit_align/edit_align.pro b/src/meshlabplugins/edit_align/edit_align.pro
index 791ed8452..7c9baabc0 100644
--- a/src/meshlabplugins/edit_align/edit_align.pro
+++ b/src/meshlabplugins/edit_align/edit_align.pro
@@ -1,7 +1,7 @@
 include (../../shared.pri)
 
 INCLUDEPATH += \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/newuoa/include
+    $$MESHLAB_EXTERNAL_DIRECTORY/newuoa/include
 
 HEADERS += \
     edit_align_factory.h \
diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
index f98d19bfb..a2706e0d4 100644
--- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
+++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
@@ -30,10 +30,10 @@ FORMS += \
 TARGET = edit_mutualcorrs
 
 INCLUDEPATH *= \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/levmar-2.3 \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/newuoa/include
+    $$MESHLAB_EXTERNAL_DIRECTORY/levmar-2.3 \
+    $$MESHLAB_EXTERNAL_DIRECTORY/newuoa/include
 
-win32-msvc:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/levmar.lib
-win32-g++:LIBS += -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -llevmar
-macx:LIBS+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/liblevmar.a
+win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/levmar.lib
+win32-g++:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc -llevmar
+macx:LIBS+= $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/liblevmar.a
 linux-g++:LIBS += -llevmar
diff --git a/src/meshlabplugins/filter_csg/filter_csg.pro b/src/meshlabplugins/filter_csg/filter_csg.pro
index cc7a18cb1..ea3cba78c 100644
--- a/src/meshlabplugins/filter_csg/filter_csg.pro
+++ b/src/meshlabplugins/filter_csg/filter_csg.pro
@@ -10,18 +10,18 @@ SOURCES += \
 
 TARGET = filter_csg
 
-macx:INCLUDEPATH += $${MESHLAB_EXTERNAL_DIRECTORY}/inc/macx64/mpir-2.4.0
-win32-g++:INCLUDEPATH += $${MESHLAB_EXTERNAL_DIRECTORY}/inc/win32-gcc/mpir-2.2.1
-win32-msvc:INCLUDEPATH += $${MESHLAB_EXTERNAL_DIRECTORY}/inc/win32-msvc/mpir-2.2.1_x64
+macx:INCLUDEPATH += $$MESHLAB_EXTERNAL_DIRECTORY/inc/macx64/mpir-2.4.0
+win32-g++:INCLUDEPATH += $$MESHLAB_EXTERNAL_DIRECTORY/inc/win32-gcc/mpir-2.2.1
+win32-msvc:INCLUDEPATH += $$MESHLAB_EXTERNAL_DIRECTORY/inc/win32-msvc/mpir-2.2.1_x64
 
-macx:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/libmpirxx.a $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/libmpir.a
-win32-g++:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/libmpirxx.a $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/libmpir.a
-win32-msvc:LIBS		 += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/mpirxx.lib $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/mpir.lib
+macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libmpirxx.a $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libmpir.a
+win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libmpirxx.a $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libmpir.a
+win32-msvc:LIBS		 += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/mpirxx.lib $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/mpir.lib
 #using a different compiled version for for msvc 2008 - 2013
-win32-msvc2008:LIBS		 += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc2008/mpirxx.lib $${MESHLAB_DISTRIB_DIRECTORY}/win32-msvc2008/mpir.lib
-win32-msvc2010:LIBS		 += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc2008/mpirxx.lib $${MESHLAB_DISTRIB_DIRECTORY}/win32-msvc2008/mpir.lib
-win32-msvc2012:LIBS		 += $${MESHLAB_DISTRIB_DIRECTORY}/win32-msvc2008/mpirxx.lib $${MESHLAB_DISTRIB_DIRECTORY}/win32-msvc2008/mpir.lib
-win32-msvc2013:LIBS		 += $${MESHLAB_DISTRIB_DIRECTORY}/win32-msvc2008/mpirxx.lib $${MESHLAB_DISTRIB_DIRECTORY}/win32-msvc2008/mpir.lib
+win32-msvc2008:LIBS		 += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc2008/mpirxx.lib $$MESHLAB_DISTRIB_DIRECTORY/win32-msvc2008/mpir.lib
+win32-msvc2010:LIBS		 += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc2008/mpirxx.lib $$MESHLAB_DISTRIB_DIRECTORY/win32-msvc2008/mpir.lib
+win32-msvc2012:LIBS		 += $$MESHLAB_DISTRIB_DIRECTORY/win32-msvc2008/mpirxx.lib $$MESHLAB_DISTRIB_DIRECTORY/win32-msvc2008/mpir.lib
+win32-msvc2013:LIBS		 += $$MESHLAB_DISTRIB_DIRECTORY/win32-msvc2008/mpirxx.lib $$MESHLAB_DISTRIB_DIRECTORY/win32-msvc2008/mpir.lib
 
 # Linux can use GMP instead, which is widely available
 linux:DEFINES += BUILD_WITH_GMP
diff --git a/src/meshlabplugins/filter_func/filter_func.pro b/src/meshlabplugins/filter_func/filter_func.pro
index f85c72cce..771154f49 100644
--- a/src/meshlabplugins/filter_func/filter_func.pro
+++ b/src/meshlabplugins/filter_func/filter_func.pro
@@ -10,12 +10,12 @@ TARGET = filter_func
 
 DEFINES += _UNICODE
 
-INCLUDEPATH += $${MESHLAB_EXTERNAL_DIRECTORY}/muparser_v225/include
+INCLUDEPATH += $$MESHLAB_EXTERNAL_DIRECTORY/muparser_v225/include
 
 # Note: we need static libs so when building muparser lib use 
 # ./configure --enable-shared=no
 
-win32-msvc:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/muparser.lib
-win32-g++:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/libmuparser.a
-macx:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/libmuparser.a
+win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/muparser.lib
+win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libmuparser.a
+macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libmuparser.a
 linux-g++:LIBS += -lmuparser
diff --git a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
index ea869d5ee..dfd36e980 100644
--- a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
+++ b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
@@ -26,16 +26,15 @@ SOURCES += \
 
 TARGET = filter_isoparametrization
 INCLUDEPATH  += \
-    ./ \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/levmar-2.3/
+    $$MESHLAB_EXTERNAL_DIRECTORY/levmar-2.3/
 				
 win32-msvc:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
 win32-g++:QMAKE_LFLAGS += -fopenmp
 linux-g++:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
 
-win32-msvc:LIBS	+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/levmar.lib
-win32-g++:LIBS += -L$${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc -llevmar
-macx:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/liblevmar.a
+win32-msvc:LIBS	+= $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/levmar.lib
+win32-g++:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc -llevmar
+macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/liblevmar.a
 linux-g++:LIBS += -llevmar
 
 # Please never ever uncomment this...
diff --git a/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro b/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro
index e86546eed..20cd6176e 100644
--- a/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro
+++ b/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro
@@ -23,5 +23,5 @@ SOURCES += \
 TARGET = filter_mutualglobal
 
 INCLUDEPATH *= \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/levmar-2.3 \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/newuoa/include
+    $$MESHLAB_EXTERNAL_DIRECTORY/levmar-2.3 \
+    $$MESHLAB_EXTERNAL_DIRECTORY/newuoa/include
diff --git a/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro b/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
index f5852adc1..60056f74d 100644
--- a/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
+++ b/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
@@ -23,7 +23,7 @@ SOURCES += \
 TARGET = filter_mutualinfo
 
 INCLUDEPATH *= \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/levmar-2.3 \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/newuoa/include
+    $$MESHLAB_EXTERNAL_DIRECTORY/levmar-2.3 \
+    $$MESHLAB_EXTERNAL_DIRECTORY/newuoa/include
 
 include (../../shared_post.pri)
diff --git a/src/meshlabplugins/filter_qhull/filter_qhull.pro b/src/meshlabplugins/filter_qhull/filter_qhull.pro
index 756131bdb..956e0ab83 100644
--- a/src/meshlabplugins/filter_qhull/filter_qhull.pro
+++ b/src/meshlabplugins/filter_qhull/filter_qhull.pro
@@ -9,34 +9,23 @@ SOURCES += \
     qhull_tools.cpp
 
 INCLUDEPATH += \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src
-
-#HEADERS += \
-#    ../../external/qhull-2003.1/src/geom.h \
-#    ../../external/qhull-2003.1/src/io.h \
-#    ../../external/qhull-2003.1/src/mem.h \
-#    ../../external/qhull-2003.1/src/merge.h \
-#    ../../external/qhull-2003.1/src/poly.h \
-#    ../../external/qhull-2003.1/src/qhull.h \
-#    ../../external/qhull-2003.1/src/qset.h \
-#    ../../external/qhull-2003.1/src/stat.h \
-#    ../../external/qhull-2003.1/src/user.h
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src
 
 #TODO: compile qhull in external and then link it here
 #      instead of including all the sources
 SOURCES += \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/geom.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/geom2.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/global.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/io.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/mem.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/merge.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/poly.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/poly2.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/qconvex.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/qhull.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/qset.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/stat.c \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/qhull-2003.1/src/user.c
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/geom.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/geom2.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/global.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/io.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/mem.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/merge.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/poly.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/poly2.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/qconvex.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/qhull.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/qset.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/stat.c \
+    $$MESHLAB_EXTERNAL_DIRECTORY/qhull-2003.1/src/user.c
 
 TARGET = filter_qhull
diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.pro b/src/meshlabplugins/filter_ssynth/filter_ssynth.pro
index 20c47cc93..48233ab4f 100644
--- a/src/meshlabplugins/filter_ssynth/filter_ssynth.pro
+++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.pro
@@ -3,7 +3,7 @@ include (../../shared.pri)
 INCLUDEPATH += \
     ../io_x3d/ \
     ../io_x3d/vrml \
-    $${MESHLAB_EXTERNAL_DIRECTORY}/structuresynth-1.5/ssynth
+    $$MESHLAB_EXTERNAL_DIRECTORY/structuresynth-1.5/ssynth
 
 HEADERS += \
     filter_ssynth.h \
@@ -24,9 +24,9 @@ OTHER_FILES += \
     x3d3.rendertemplate \
     x3d4.rendertemplate
 
-win32-msvc:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/ssynth.lib
-win32-g++:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/libssynth.a
-macx:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/libssynth.a
+win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/ssynth.lib
+win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libssynth.a
+macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libssynth.a
 linux-g++:LIBS += -lssynth
 
 TARGET = filter_ssynth
diff --git a/src/meshlabplugins/io_3ds/io_3ds.pro b/src/meshlabplugins/io_3ds/io_3ds.pro
index ad9f44597..0d52dbfc5 100644
--- a/src/meshlabplugins/io_3ds/io_3ds.pro
+++ b/src/meshlabplugins/io_3ds/io_3ds.pro
@@ -24,9 +24,9 @@ TARGET = io_3ds
 # where XXX is the name of your system according to the QT naming style.
 # Linux users can rely on their own package managers and hope that it is installing the last version of lib3ds
 
-win32-msvc:LIBS	+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/3ds.lib
-win32-g++:LIBS	+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/lib3ds.a
-macx:LIBS       += $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/lib3ds.a
+win32-msvc:LIBS	+= $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/3ds.lib
+win32-g++:LIBS	+= $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/lib3ds.a
+macx:LIBS       += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/lib3ds.a
 linux-g++:LIBS  += -l3ds
 
 
diff --git a/src/meshlabplugins/io_ctm/io_ctm.pro b/src/meshlabplugins/io_ctm/io_ctm.pro
index d176f22f5..0883c8666 100644
--- a/src/meshlabplugins/io_ctm/io_ctm.pro
+++ b/src/meshlabplugins/io_ctm/io_ctm.pro
@@ -10,12 +10,12 @@ SOURCES += \
 
 TARGET = io_ctm
 
-!CONFIG(system_openctm): INCLUDEPATH *= $${MESHLAB_EXTERNAL_DIRECTORY}/OpenCTM-1.0.3/lib
+!CONFIG(system_openctm): INCLUDEPATH *= ${MESHLAB_EXTERNAL_DIRECTORY}/OpenCTM-1.0.3/lib
 
 win32-msvc:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
 win32-g++:DEFINES += OPENCTM_STATIC
 
-win32-msvc:LIBS	+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/openctm.lib
-win32-g++:LIBS	+= $${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/libopenctm.a
-macx:LIBS       += $${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/libopenctm.a
+win32-msvc:LIBS	+= ${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-msvc/openctm.lib
+win32-g++:LIBS	+= ${MESHLAB_DISTRIB_DIRECTORY}/lib/win32-gcc/libopenctm.a
+macx:LIBS       += ${MESHLAB_DISTRIB_DIRECTORY}/lib/macx64/libopenctm.a
 linux-g++:LIBS  += -lopenctm
diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro
index 0a10891a5..02d178ebf 100644
--- a/src/meshlabserver/meshlabserver.pro
+++ b/src/meshlabserver/meshlabserver.pro
@@ -17,11 +17,11 @@ QT += xml opengl
 QT += xmlpatterns
 QT += script
 
-DESTDIR = $${MESHLAB_DISTRIB_DIRECTORY}
-macx:DESTDIR = $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS/
-macx:QMAKE_POST_LINK ="install_name_tool -change libcommon.1.dylib @executable_path/libcommon.1.dylib $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS/meshlabserver"
+DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY
+macx:DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS/
+macx:QMAKE_POST_LINK ="install_name_tool -change libcommon.1.dylib @executable_path/libcommon.1.dylib $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS/meshlabserver"
 
-mac:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/meshlab.app/Contents/MacOS/libcommon.dylib
+mac:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/meshlab.app/Contents/MacOS/libcommon.dylib
 
 win32-msvc: LIBS += -lcommon -lopengl32 -lGLU32
 win32-g++: LIBS += -lcommon
diff --git a/src/shared.pri b/src/shared.pri
index d81d81e4b..5cfd63a22 100644
--- a/src/shared.pri
+++ b/src/shared.pri
@@ -12,8 +12,8 @@ QT += xml
 QT += xmlpatterns
 QT += script
 
-mac:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/libcommon.dylib
-win32-msvc:LIBS += $${MESHLAB_DISTRIB_DIRECTORY}/lib/common.lib -lopengl32 -lGLU32
+mac:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/libcommon.dylib
+win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/common.lib -lopengl32 -lGLU32
 win32-g++:LIBS += -lcommon -lopengl32 -lGLU32
 linux-g++:LIBS += -lcommon -lGL -lGLU
 
@@ -28,7 +28,7 @@ CONFIG(release,debug | release){
 #DEFINES += NDEBUG
  }
 
-DESTDIR = $${MESHLAB_DISTRIB_DIRECTORY}/plugins
+DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/plugins
 # uncomment in you local copy only in emergency cases.
 # We should never be too permissive
 # win32-g++:QMAKE_CXXFLAGS += -fpermissive
diff --git a/src/shared_post.pri b/src/shared_post.pri
index 8a6d4b855..5b4733bbd 100644
--- a/src/shared_post.pri
+++ b/src/shared_post.pri
@@ -6,7 +6,7 @@
 
 exists( $${_PRO_FILE_PWD_}/$${TARGET}.xml ) {
 
-QMAKE_POST_LINK += $$QMAKE_COPY_FILE \"$${_PRO_FILE_PWD_}/$${TARGET}.xml\" \"$${MESHLAB_DISTRIB_DIRECTORY}/plugins/$${TARGET}.xml\";
+QMAKE_POST_LINK += $$QMAKE_COPY_FILE \"$${_PRO_FILE_PWD_}/$${TARGET}.xml\" \"$$MESHLAB_DISTRIB_DIRECTORY/plugins/$${TARGET}.xml\";
 
 }