Merge branch '2.0' into develop

CMakeLists.txt

@@ -98,6 +98,11 @@ endif()
 
 set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/${MAXSCALE_LIBDIR})
 
+# Only do packaging if configured
+if(PACKAGE)
+  include(cmake/package.cmake)
+endif()
+
 # Make sure the release notes for this release are present if it is a stable one
 if(${MAXSCALE_VERSION} MATCHES "-stable")
   file(GLOB ${CMAKE_SOURCE_DIR}/Documentation/Release-Notes RELEASE_NOTES *${MAXSCALE_VERSION_NUMERIC}*.md)
@@ -227,7 +232,6 @@ if(WITH_SCRIPTS)
   include(cmake/init_scripts.cmake)
 endif()
 
-# Only do packaging if configured
 if(PACKAGE)
 
   # Install the files copied by the postinst script into the share folder
@@ -236,9 +240,6 @@ if(PACKAGE)
   install_program(${CMAKE_BINARY_DIR}/postinst core)
   install_program(${CMAKE_BINARY_DIR}/postrm core)
 
-  # Include the package configuration
-  include(cmake/package.cmake)
-
   # CPack needs to be included after everything is configured
   include(CPack)
 endif()