Merge remote-tracking branch 'upstream/master'

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19c560f769cc7055e2eb472a0a958ab08f92193c..8f9de5ec711b1a0c2d5cbf1058858d49415e9801 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,17 @@ set(WEBSITESCRIPTS
     website/status.php
 )
 
     website/status.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/importWikipedia.php
 set(CUSTOMSCRIPTS
     utils/country_languages.php
     utils/importWikipedia.php


@@ -125,15 +136,14 @@ foreach (script_source ${WEBSITESCRIPTS})
                    ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 
                    ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 

-set(CONFIGUREFILES
-    settings/phrase_settings.php
-    settings/defaults.php
-   )
-
-foreach (cfile ${CONFIGUREFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+foreach (webfile ${WEBSITEFILES})
+    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
+                   ${PROJECT_BINARY_DIR}/website/${webfile})

 endforeach()
 
 endforeach()
 

+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+               ${PROJECT_BINARY_DIR}/settings/settings.php)
+

 set(WEBPATHS css images js)
 
 foreach (wp ${WEBPATHS})
 set(WEBPATHS css images js)
 
 foreach (wp ${WEBPATHS})