--- a/ProjectDefinition.st	Wed Oct 05 23:39:06 2016 +0200
+++ b/ProjectDefinition.st	Thu Oct 06 00:25:29 2016 +0200
@@ -3791,6 +3791,7 @@
         at: 'TOP' put: (self pathToTopWithSeparator:'/');                 "/ unix here
 "/        at: 'MODULE_PATH' put: ( self moduleDirectory );        "/ unix here
         at: 'DESCRIPTION' put: (self description);
+        at: 'PRODUCT_NAME' put: (self productName);
         at: 'PRODUCT_VERSION' put: (self productVersion);
         at: 'PRODUCT_DATE' put: (self productDate);
         at: 'PRODUCT_PUBLISHER' put: (self productPublisher);
@@ -3799,8 +3800,13 @@
         at: 'PRODUCT_TYPE' put: (self productType);
         at: 'PRODUCT_LICENSE' put: (self productLicense);
         at: 'PRODUCT_DESCRIPTION' put: (self productDescription);
+        at: 'PRODUCT_CPU_VERSIONS' put: 'x86';
+        at: 'PRODUCT_ROOT_NAME' put: (self productName);
         at: 'MAINTAINER' put: (self productMaintainer);
         at: 'PACKAGER' put: (self productPublisher);
+        at: 'ADDITIONAL_SOURCE_DIRS' put: '';
+        at: 'ADDITIONAL_COPYFILES' put: '';
+        at: 'ADDITIONAL_INSTALL' put: '';
         yourself.
 
 
@@ -4815,12 +4821,12 @@
 ShortName: %(APPLICATION)
 SoftwareVersion: %(PRODUCT_VERSION)
 DisplayName: %(DESCRIPTION)
-RootName: @exept.de/expecco:$SOFTWAREVERSION
+RootName: %(PRODUCT_ROOT_NAME)
 Summary: %(DESCRIPTION)
 Maintainer: %(MAINTAINER)
 Packager: %(PACKAGER)
 PackageVersion: 1
-CPUArchitectures: x86
+CPUArchitectures: %(PRODUCT_CPU_VERSIONS)
 AutopackageTarget: 1.0
 Type: %(PRODUCT_TYPE)
 License: %(PRODUCT_LICENSE)
@@ -4851,18 +4857,7 @@
 [Imports]
 import <<EOF
 $source_dir/%(APPLICATION)
-$source_dir/resources
-$source_dir/keyboard.rc
-$source_dir/keyboardMacros.rc
-$source_dir/display.rc
-$source_dir/host.rc
-$source_dir/../doc
-$source_dir/../testsuites/webedition
-$source_dir/../projects/libraries
-$source_dir/../reportGenerator/tools
-$source_dir/../../pdf/afm
-$source_dir/../plugin/selenium/libexept_expecco_plugin_selenium.so
-$source_dir/../externalTools
+%(ADDITIONAL_SOURCE_DIRS)
 EOF
 
 for i in $source_dir/*.so
@@ -4878,22 +4873,12 @@
 
 find . -type d \( -name CVS -or -name ''not_*'' \) -print | xargs rm -rf
 mkdir -p $MYPREFIX
-copyFiles expecco *.rc resources        $MYPREFIX/bin
-copyFiles *.so                          $MYPREFIX/lib
-copyFiles doc externalTools             $MYPREFIX/packages/exept/expecco
-copyFiles webedition/projects libraries $MYPREFIX/testsuites
-copyFiles tools                         $MYPREFIX/packages/exept/expecco/reportGenerator
-copyFiles afm                           $MYPREFIX/packages/exept/pdf
-copyFiles libexept_expecco_plugin_selenium.so   $MYPREFIX/plugin
-
-#installExe expecco
+copyFiles %(PRODUCT_NAME) *.rc resources        $MYPREFIX/bin
+%(ADDITIONAL_COPYFILES)
+
+#installExe %(PRODUCT_NAME)
 #installLib *.so
-#installData resources
-#installData keyboard.rc
-#installData keyboardMacros.rc
-#installData host.rc
-#installData display.rc
-#installData doc
+%(ADDITIONAL_INSTALL)
 
 [Uninstall]
 # Leaving this at the default is safe unless you use custom commands in