diff --git a/make/fc-mod-cpp.mk b/make/fc-mod-cpp.mk
index 36deb29d..c7510a34 100644
--- a/make/fc-mod-cpp.mk
+++ b/make/fc-mod-cpp.mk
@@ -1,33 +1,38 @@
-#FC_BASE_DIR = $(HOME)/rpmbuild/BUILD/FreeCAD-git
-#FC_PREFIX = $(HOME)/rpmbuild/BUILDROOT/FreeCAD-0.17_pre_4961_g526ead1c7-20170725.x86_64.test
-FC_PREFIX =
-FC_MODULE_BASENAME ?= $(notdir $(shell pwd))
-FC_PY_API_XML = $(wildcard *.xml)
-FC_INIT_PY ?= $(wildcard Init.py InitGui.py)
-FC_GENERATED_CPP = $(patsubst %.xml,%.cpp,$(FC_PY_API_XML))
-FC_GENERATED_H = $(patsubst %.xml,%.h,$(FC_PY_API_XML))
-FC_GENERATED_O = $(patsubst %.xml,%.o,$(FC_PY_API_XML))
-FC_GENERATED = $(FC_GENERATED_H) $(FC_GENERATED_CPP) $(FC_GENERATED_O)
-FC_OBJ = $(patsubst %.cpp,%.o,$(filter-out $(FC_GENERATED_CPP),$(wildcard *.cpp)))
-FC_MODULE = $(FC_MODULE_BASENAME).so
+#FC_BASE_DIR                = $(HOME)/rpmbuild/BUILD/FreeCAD-git
 
-#FC_GENERATE_PY=$(FC_BASE_DIR)/src/Tools/generate.py
-#FC_GENERATE_PY = $(FC_PREFIX)/usr/bin/fc-generate.py
-FC_GENERATE_PY = $(FC_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/Tools/generate.py
+# FC_PREFIX is for testing against the FreeCAD source tree
+#FC_PREFIX                  = $(HOME)/rpmbuild/BUILDROOT/FreeCAD-0.17_pre_4961_g526ead1c7-20170725.x86_64.test
+#FC_PREFIX                  =
 
-FC_INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/lib
-FC_INSTALL_PYDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/Mod/$(FC_MODULE_BASENAME)
-FC_INSTALLED_MODULE = $(FC_INSTALL_LIBDIR)/$(FC_MODULE)
-FC_INSTALLED_PYTHON = $(addprefix $(FC_INSTALL_PYDIR)/,$(FC_INIT_PY))
-FC_INSTALL_DIRS = $(sort $(FC_INSTALL_LIBDIR) $(FC_INSTALL_PYDIR))
-FC_INSTALLED = $(FC_INSTALLED_MODULE) $(FC_INSTALLED_PYTHON)
+FC_MODULE_BASENAME        ?= $(notdir $(shell pwd))
+FC_PY_API_XML              = $(wildcard *.xml)
+FC_INIT_PY                ?= $(wildcard Init.py InitGui.py)
+FC_GENERATED_CPP           = $(patsubst %.xml,%.cpp,$(FC_PY_API_XML))
+FC_GENERATED_H             = $(patsubst %.xml,%.h,$(FC_PY_API_XML))
+FC_GENERATED_O             = $(patsubst %.xml,%.o,$(FC_PY_API_XML))
+FC_GENERATED               = $(FC_GENERATED_H) $(FC_GENERATED_CPP) $(FC_GENERATED_O)
+FC_OBJ                     = $(patsubst %.cpp,%.o,$(filter-out $(FC_GENERATED_CPP),$(wildcard *.cpp)))
+FC_MODULE                  = $(FC_MODULE_BASENAME).so
 
-#INCLUDE += -I$(FC_BASE_DIR)/src -I$(FC_BASE_DIR)/build/src
-INCLUDE += -I$(FC_PREFIX)/usr/include/FreeCAD
-INCLUDE += $(shell pkg-config --cflags python QtCore) -I/usr/include/oce
-#LIBFLAGS += -L$(FC_BASE_DIR)/build/lib -lFreeCADApp -lFreeCADBase
-LIBFLAGS += -L$(FC_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/FreeCAD/lib -lFreeCADApp -lFreeCADBase
-LIBFLAGS += $(shell pkg-config --libs python QtCore)
+ENV_PREFIX                ?= $(FC_PREFIX)
+FC_INSTALL_DIR            ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/FreeCAD
+#FC_GENERATE_PY             = $(FC_BASE_DIR)/src/Tools/generate.py
+#FC_GENERATE_PY             = $(FC_PREFIX)/usr/bin/fc-generate.py
+FC_GENERATE_PY             = $(FC_INSTALL_DIR)/Tools/generate.py
+
+FC_INSTALL_PYDIR           = $(FC_INSTALL_DIR)/Mod/$(FC_MODULE_BASENAME)
+FC_INSTALL_LIBDIR          = $(FC_INSTALL_DIR)/lib
+FC_INSTALLED_MODULE        = $(FC_INSTALL_LIBDIR)/$(FC_MODULE)
+FC_INSTALLED_PYTHON        = $(addprefix $(FC_INSTALL_PYDIR)/,$(FC_INIT_PY))
+FC_INSTALL_DIRS            = $(sort $(FC_INSTALL_LIBDIR) $(FC_INSTALL_PYDIR))
+FC_INSTALLED               = $(FC_INSTALLED_MODULE) $(FC_INSTALLED_PYTHON)
+
+#INCLUDE                   += -I$(FC_BASE_DIR)/src -I$(FC_BASE_DIR)/build/src
+INCLUDE                   += -I$(FC_PREFIX)/usr/include/FreeCAD
+INCLUDE                   += $(shell pkg-config --cflags python QtCore) -I/usr/include/opencascade -I/usr/include/occ
+#LIBFLAGS                  += -L$(FC_BASE_DIR)/build/lib -lFreeCADApp -lFreeCADBase
+LIBFLAGS                  += -L$(FC_INSTALL_LIBDIR) -lFreeCADApp -lFreeCADBase
+LIBFLAGS                  += $(shell pkg-config --libs python QtCore)
 
 #/usr/bin/c++ -fPIC -Wall -Wextra -Wno-write-strings -fpermissive -std=c++11 -D_OCC64 -g -DFC_DEBUG -Wl,--no-undefined -shared -Wl,-soname,Image.so -o ../../../../Mod/Image/Image.so CMakeFiles/Image.dir/ImageBase.cpp.o CMakeFiles/Image.dir/ImagePlane.cpp.o CMakeFiles/Image.dir/PreCompiled.cpp.o CMakeFiles/Image.dir/AppImage.cpp.o -Wl,-rpath,/home/jan/rpmbuild/BUILD/FreeCAD-git/build/lib: ../../../../lib/libFreeCADApp.so ../../../../lib/libFreeCADBase.so -lpython2.7 -lxerces-c -lz -lutil -ldl -lboost_filesystem -lboost_program_options -lboost_regex -lboost_signals -lboost_system -lboost_thread -lboost_chrono -lboost_date_time -lboost_atomic -lQtXml -lQtCore