X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a3b4f80c996056136828560e8e5fb26db367f238..65c89194fccef562c544c05dbcef0d9e6ad16a0d:/CMakeLists.txt?ds=inline

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755
new mode 100644
index af6b9a92..8f9de5ec
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(nominatim)
 
 set(NOMINATIM_VERSION_MAJOR 3)
-set(NOMINATIM_VERSION_MINOR 1)
+set(NOMINATIM_VERSION_MINOR 2)
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@ -93,8 +93,7 @@ message (STATUS "Using PHP binary " ${PHP_BIN})
 #
 #-----------------------------------------------------------------------------
 
-set(CUSTOMFILES
-    settings/phrase_settings.php
+set(WEBSITESCRIPTS
     website/deletable.php
     website/details.php
     website/hierarchy.php
@@ -103,24 +102,47 @@ set(CUSTOMFILES
     website/reverse.php
     website/search.php
     website/status.php
-    utils/blocks.php
+)
+
+set(WEBSITEFILES
+    403.html
+    509.html
+    crossdomain.xml
+    favicon.ico
+    last_update.php
+    nominatim.xml
+    robots.txt
+    taginfo.json
+)
+
+set(CUSTOMSCRIPTS
     utils/country_languages.php
-    utils/imports.php
     utils/importWikipedia.php
     utils/export.php
     utils/query.php
-    utils/server_compare.php
     utils/setup.php
     utils/specialphrases.php
     utils/update.php
     utils/warm.php
    )
 
-foreach (cfile ${CUSTOMFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+foreach (script_source ${CUSTOMSCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                   ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 
-configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+foreach (script_source ${WEBSITESCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                   ${PROJECT_BINARY_DIR}/${script_source})
+endforeach()
+
+foreach (webfile ${WEBSITEFILES})
+    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
+                   ${PROJECT_BINARY_DIR}/website/${webfile})
+endforeach()
+
+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+               ${PROJECT_BINARY_DIR}/settings/settings.php)
 
 set(WEBPATHS css images js)