From 294a9b67d2e7a9439d303c00785cf689be0eb750 Mon Sep 17 00:00:00 2001 From: Alex Olivas Date: Tue, 19 Mar 2024 16:22:04 -0600 Subject: [PATCH 01/10] adding a few minor tweaks to the docs that i found helpful --- docs/get-started/Setup.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/get-started/Setup.md b/docs/get-started/Setup.md index c1488b8c5..79de46ac5 100644 --- a/docs/get-started/Setup.md +++ b/docs/get-started/Setup.md @@ -17,8 +17,9 @@ postgres=# CREATE USER underpass WITH PASSWORD 'your_password'; postgres=# CREATE DATABASE underpass; postgres=# GRANT ALL PRIVILEGES ON DATABASE "underpass" to underpass; postgres=# ALTER ROLE underpass SUPERUSER; +postgres=# exit exit -psql postgresql://underpass:your_password@localhost:5432/underpass < setup/underpass.sql +psql postgresql://underpass:your_password@localhost:5432/underpass < setup/db/underpass.sql ``` #### Requirements @@ -26,6 +27,7 @@ psql postgresql://underpass:your_password@localhost:5432/underpass < setup/under ``` sudo apt install python3-pip -y sudo apt install python3.11-venv +python3 -m venv ~/venv source ~/venv/bin/activate pip install fiona pip install shapely @@ -36,7 +38,9 @@ apt install osm2pgsql Go to the `setup` directory and run the boostrap script: +``` cd utils +chmod +x bootstrap.sh ./bootstrap.sh -r south-america -c uruguay ``` From 6bf29d50d96ff83bb0b874c30bfa389fd5805abc Mon Sep 17 00:00:00 2001 From: Alex Olivas Date: Tue, 19 Mar 2024 16:23:15 -0600 Subject: [PATCH 02/10] if you choose any password that's not 'underpass' during the db configuration the bootstrap fails locally. --- setup/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 setup/bootstrap.sh diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh old mode 100644 new mode 100755 index db0cd30de..035401cb5 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -119,7 +119,7 @@ then then docker exec -w /code/build -t underpass underpass --bootstrap else - underpass --bootstrap + underpass --bootstrap --server=$USER:$PASS@$HOST:$PORT/$DB fi echo "Done." echo " " From 8d4f8465e909f53299647342f9e5fe42a32b89c4 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 28 Mar 2024 00:23:44 -0600 Subject: [PATCH 03/10] fix: Use python3-config instead of pkg-config --- configure.ac | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 547a99f3a..dd5855985 100644 --- a/configure.ac +++ b/configure.ac @@ -163,9 +163,8 @@ fi dnl range-v3 CPPFLAGS+=" $(pkg-config --cflags libpqxx)" CPPFLAGS+=" $(pkg-config --cflags gumbo)" -CPPFLAGS+=" $(pkg-config --cflags gdal)" CPPFLAGS+=" $(pkg-config --cflags ompi)" -CPPFLAGS+=" $(pkg-config --cflags python3)" +CPPFLAGS+=" $(python3-config --cflags)" dnl This is a C++ project only AC_LANG_PUSH(C++) @@ -183,9 +182,8 @@ LIBS+=" $(pkg-config --libs libpqxx)" LIBS+=" $(pkg-config --libs openssl)" LIBS+=" $(pkg-config --libs gumbo)" LIBS+=" $(pkg-config --libs zlib)" -LIBS+=" $(pkg-config --libs gdal)" LIBS+=" $(pkg-config --libs ompi)" -LIBS+=" $(pkg-config --libs python3)" +LIBS+=" $(python3-config --libs)" if test x"${build_libxml}" = x"yes"; then dnl Debian Buster and Ubuntu Focal ship 2.6, Fedora ships 3,.0 dnl The version in Focal is broken, so either build libxml++-3.0 @@ -209,16 +207,16 @@ LIBS+=" -lpthread -ldl" dnl 1.69 or newer AX_BOOST_BASE(1.69) +AX_BOOST_IOSTREAMS AX_BOOST_SYSTEM AX_BOOST_SERIALIZATION -AX_BOOST_LOG -AX_BOOST_PROGRAM_OPTIONS AX_BOOST_DATE_TIME AX_BOOST_FILESYSTEM -AX_BOOST_IOSTREAMS AX_BOOST_THREAD AX_BOOST_LOCALE AX_BOOST_TIMER +AX_BOOST_LOG +AX_BOOST_PROGRAM_OPTIONS dnl For some reason this test works on Fedora, and fails on Debian. For now dnl hardcode it. dnl AX_BOOST_REGEX @@ -227,6 +225,9 @@ LIBS+=" -lboost_regex" dnl LIBS += "${BOOST_DATE_TIME} ${BOOST_SYSTEM} ${BOOST_FILESYSTEM} ${BOOST_LOG_LIB}" AC_LANG_POP(C++) +CPPFLAGS+=" $(pkg-config --cflags gdal)" +LIBS+=" $(pkg-config --libs gdal)" + AM_PATH_PYTHON([3]) AC_ARG_ENABLE([python], @@ -234,7 +235,7 @@ AC_ARG_ENABLE([python], if test x"${enable_python}" = x"yes"; then LIBS+=" $(python3-config --libs)" - LIBS+=" $(pkg-config --libs python3-embed)" + LIBS+=" $(python3-config --embed)" CPPFLAGS+=" $(python3-config --cflags)" AX_BOOST_PYTHON AC_DEFINE(USE_PYTHON, [1], [Enable Python binding]) @@ -292,7 +293,7 @@ AC_OUTPUT if test x"${build_libxml}" = x"yes"; then echo "Using libxml for XML parsing" else - echo "Using RaqpidXML for XML parsing, which is used by boost::parse_tree" + echo "Using RapidXML for XML parsing, which is used by boost::parse_tree" fi # Local Variables: # c-basic-offset: 2 From 614c79b99e61ed49b350155618449d9278bf3dd1 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 28 Mar 2024 07:27:14 -0600 Subject: [PATCH 04/10] fix: Install files for /etc under /usr/local/etc --- Makefile.am | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9ab61234e..f6eb71a0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,7 @@ CLEANFILES = \ DISTCLEANFILES = docs/html docs/latex .lastmod MAINTAINERCLEANFILES = revno.h .lastmod +ETCDIR = $(subst lib,etc,$(pkglibdir)) SUBDIRS = \ src/validate @@ -91,7 +92,8 @@ AM_CXXFLAGS = \ -fno-builtin-malloc \ -fno-builtin-calloc \ -fno-builtin-realloc \ - -fno-builtin-free + -fno-builtin-free \ + -DETCDIR=$(ETCDIR) else AM_CXXFLAGS = \ -rdynamic \ @@ -119,7 +121,7 @@ EXTRA_DIST = \ dist/debian \ dist/redhat \ utils - + DEJATOOL = libunderpass @@ -151,17 +153,17 @@ apidoc: endif install-data-hook: - $(MKDIR_P) $(DESTDIR)/$(pkglibdir) - $(MKDIR_P) /etc/underpass - cp -rvp $(srcdir)/config/priority.geojson /etc/underpass/ - cp -rvp $(srcdir)/config/replicator /etc/underpass/ - cp -rvp $(srcdir)/config/validate /etc/underpass/ - cp -rvp $(srcdir)/config/stats /etc/underpass/ - cp -rvp $(srcdir)/config/default.yaml /etc/underpass/ + $(MKDIR_P) $(DESTDIR)$(ETCDIR) + cp -rvp $(srcdir)/config/priority.geojson $(DESTDIR)$(ETCDIR)/ + cp -rvp $(srcdir)/config/replicator $(DESTDIR)$(ETCDIR)/ + cp -rvp $(srcdir)/config/validate $(DESTDIR)$(ETCDIR)/ + cp -rvp $(srcdir)/config/stats $(DESTDIR)$(ETCDIR)/ + cp -rvp $(srcdir)/config/default.yaml $(DESTDIR)$(ETCDIR)/ $(MKDIR_P) $(DESTDIR)/$(docdir) cp -rvp $(srcdir)/docs/*.md $(DESTDIR)/$(docdir) cp -rvp $(srcdir)/setup/service $(DESTDIR)/$(pkglibdir) - cp -rvp $(srcdir)/setup/service/underpass.service /etc/systemd/system/ + $(MKDIR_P) $(DESTDIR)$(pkglibdir)/../system + cp -rvp $(srcdir)/setup/service/underpass.service $(DESTDIR)$(pkglibdir)/../system/ dist-hook: apidoc $(MKDIR_P) $(DESTDIR)/$(docdir) From 8dbdde5a247472e4b098a47a3f66fa2bb2ee0550 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 28 Mar 2024 07:28:25 -0600 Subject: [PATCH 05/10] fix: Use macro to define /etc/underpass directory --- src/replicator/planetreplicator.cc | 2 +- src/stats/statsconfig.cc | 2 +- src/testsuite/libunderpass.all/geo-test.cc | 2 +- src/underpass.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/replicator/planetreplicator.cc b/src/replicator/planetreplicator.cc index 59d43a181..1e8734116 100644 --- a/src/replicator/planetreplicator.cc +++ b/src/replicator/planetreplicator.cc @@ -102,7 +102,7 @@ PlanetReplicator::PlanetReplicator(void) {}; std::shared_ptr PlanetReplicator::findRemotePath(const underpassconfig::UnderpassConfig &config, ptime time) { yaml::Yaml yaml; - std::string rep_file = "/etc/underpass/replicator/planetreplicator.yaml"; + std::string rep_file = "ETCDIR/replicator/planetreplicator.yaml"; yaml.read(rep_file); std::map hashes; diff --git a/src/stats/statsconfig.cc b/src/stats/statsconfig.cc index 5acc60947..0e1203a0d 100644 --- a/src/stats/statsconfig.cc +++ b/src/stats/statsconfig.cc @@ -51,7 +51,7 @@ namespace statsconfig { StatsConfig::StatsConfig() { if (path.empty()) { - path = "/etc/underpass/stats/statistics.yaml"; + path = "ETCDIR/stats/statistics.yaml"; if (!boost::filesystem::exists(path)) { throw std::runtime_error("Statistics file not found: " + path); } diff --git a/src/testsuite/libunderpass.all/geo-test.cc b/src/testsuite/libunderpass.all/geo-test.cc index b90f1f21c..400512732 100644 --- a/src/testsuite/libunderpass.all/geo-test.cc +++ b/src/testsuite/libunderpass.all/geo-test.cc @@ -61,7 +61,7 @@ main(int argc, char* argv[]) return 1; } - if (tgu.readFile("/etc/underpass/priority.geojson")) { + if (tgu.readFile("ETCDIR/priority.geojson")) { runtest.pass("Read file with absolute path"); } else { runtest.fail("Read file with absolute path"); diff --git a/src/underpass.cc b/src/underpass.cc index b672ee9f4..3a38f6b11 100644 --- a/src/underpass.cc +++ b/src/underpass.cc @@ -85,7 +85,7 @@ main(int argc, char *argv[]) { std::string datadir = "replication/"; - std::string boundary = "/etc/underpass/priority.geojson"; + std::string boundary = "ETCDIR/priority.geojson"; UnderpassConfig config; From 751b237603a2958cce3563b343a7b811a9dca399 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Fri, 29 Mar 2024 05:34:32 -0600 Subject: [PATCH 06/10] fix: Make the etc directory configurable so it installs without being root --- Makefile.am | 4 ++-- src/replicator/planetreplicator.cc | 3 ++- src/stats/statsconfig.cc | 3 ++- src/testsuite/libunderpass.all/Makefile.am | 3 +++ src/testsuite/libunderpass.all/geo-test.cc | 4 +++- src/underpass.cc | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index f6eb71a0e..7c35fa6fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,8 +92,7 @@ AM_CXXFLAGS = \ -fno-builtin-malloc \ -fno-builtin-calloc \ -fno-builtin-realloc \ - -fno-builtin-free \ - -DETCDIR=$(ETCDIR) + -fno-builtin-free else AM_CXXFLAGS = \ -rdynamic \ @@ -104,6 +103,7 @@ endif AM_CPPFLAGS = \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DSRCDIR=\"$(srcdir)\" \ + -DETCDIR=\"$(ETCDIR)\" \ -DBOOST_LOCALE_HIDE_AUTO_PTR # Optionally timing can be turned on, which produces volumes of output which adds too much # clutter to the output. This should only be enabled when doing performance tuning. diff --git a/src/replicator/planetreplicator.cc b/src/replicator/planetreplicator.cc index 1e8734116..eb24febb7 100644 --- a/src/replicator/planetreplicator.cc +++ b/src/replicator/planetreplicator.cc @@ -102,7 +102,8 @@ PlanetReplicator::PlanetReplicator(void) {}; std::shared_ptr PlanetReplicator::findRemotePath(const underpassconfig::UnderpassConfig &config, ptime time) { yaml::Yaml yaml; - std::string rep_file = "ETCDIR/replicator/planetreplicator.yaml"; + std::string rep_file = ETCDIR; + rep_file += "replicator/planetreplicator.yaml"; yaml.read(rep_file); std::map hashes; diff --git a/src/stats/statsconfig.cc b/src/stats/statsconfig.cc index 0e1203a0d..782dd830c 100644 --- a/src/stats/statsconfig.cc +++ b/src/stats/statsconfig.cc @@ -51,7 +51,8 @@ namespace statsconfig { StatsConfig::StatsConfig() { if (path.empty()) { - path = "ETCDIR/stats/statistics.yaml"; + path = ETCDIR; + path += "/stats/statistics.yaml"; if (!boost::filesystem::exists(path)) { throw std::runtime_error("Statistics file not found: " + path); } diff --git a/src/testsuite/libunderpass.all/Makefile.am b/src/testsuite/libunderpass.all/Makefile.am index 216e26dd9..30c0ddbe9 100644 --- a/src/testsuite/libunderpass.all/Makefile.am +++ b/src/testsuite/libunderpass.all/Makefile.am @@ -19,6 +19,8 @@ AUTOMAKE_OPTIONS = dejagnu +ETCDIR = $(subst lib,etc,$(pkglibdir)) + check_PROGRAMS = \ pq-test \ change-test \ @@ -55,6 +57,7 @@ AM_CXXFLAGS = \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DTOPSRCDIR=\"$(TOPSRC)\" \ -DSRCDIR=\"$(srcdir)\" \ + -DETCDIR=\"$(ETCDIR)\" \ -DBOOST_LOCALE_HIDE_AUTO_PTR \ -Wno-deprecated-declarations diff --git a/src/testsuite/libunderpass.all/geo-test.cc b/src/testsuite/libunderpass.all/geo-test.cc index 400512732..41060e6bf 100644 --- a/src/testsuite/libunderpass.all/geo-test.cc +++ b/src/testsuite/libunderpass.all/geo-test.cc @@ -61,7 +61,9 @@ main(int argc, char* argv[]) return 1; } - if (tgu.readFile("ETCDIR/priority.geojson")) { + std::string filespec = ETCDIR; + filespec += "/priority.geojson"; + if (tgu.readFile(filespec)) { runtest.pass("Read file with absolute path"); } else { runtest.fail("Read file with absolute path"); diff --git a/src/underpass.cc b/src/underpass.cc index 3a38f6b11..689bd91f0 100644 --- a/src/underpass.cc +++ b/src/underpass.cc @@ -85,7 +85,8 @@ main(int argc, char *argv[]) { std::string datadir = "replication/"; - std::string boundary = "ETCDIR/priority.geojson"; + std::string boundary = ETCDIR; + boundary += "/priority.geojson"; UnderpassConfig config; From 147d4bded88954da21232504204528cc5a50b94d Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Fri, 29 Mar 2024 08:08:40 -0600 Subject: [PATCH 07/10] fix: More /etc fixes found during bootstrap --- src/underpassconfig.hh | 6 ++++-- src/validate/Makefile.am | 2 ++ src/validate/validate.hh | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/underpassconfig.hh b/src/underpassconfig.hh index 5fd49fe8a..7ab92ce9d 100644 --- a/src/underpassconfig.hh +++ b/src/underpassconfig.hh @@ -103,9 +103,11 @@ struct UnderpassConfig { UnderpassConfig() { - if (std::filesystem::exists("/etc/underpass/default.yaml")) { + std::string filespec = ETCDIR; + filespec += "default.yaml"; + if (std::filesystem::exists(filespec)) { yaml::Yaml yaml; - yaml.read("/etc/underpass/default.yaml"); + yaml.read(filespec); auto yamlConfig = yaml.get("config"); if (yaml.contains_key("underpass_db_url")) { underpass_db_url = yamlConfig.get_value("underpass_db_url"); diff --git a/src/validate/Makefile.am b/src/validate/Makefile.am index 6e4631d78..42229a27a 100644 --- a/src/validate/Makefile.am +++ b/src/validate/Makefile.am @@ -19,6 +19,7 @@ # AUTOMAKE_OPTIONS = -Wno-portability dejagnu subdir-objects lib_LTLIBRARIES = libunderpass.la +ETCDIR = $(subst lib,etc,$(pkglibdir)) BOOST_LIBS = $(BOOST_DATE_TIME_LIB) \ $(BOOST_SYSTEM_LIB) \ @@ -47,6 +48,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DSRCDIR=\"$(srcdir)\" \ + -DETCDIR=\"$(ETCDIR)\" \ -DBOOST_LOCALE_HIDE_AUTO_PTR install-data-hook: diff --git a/src/validate/validate.hh b/src/validate/validate.hh index 1a216941e..d66d62476 100644 --- a/src/validate/validate.hh +++ b/src/validate/validate.hh @@ -179,7 +179,8 @@ class ValidateStatus { class BOOST_SYMBOL_VISIBLE Validate { public: Validate(void) { - std::string path = "/etc/underpass/validate"; + std::string path = ETCDIR; + path += "/validate"; loadConfig(path); } From 31bed4333efee49537d286be4157daed3d16d3e7 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 30 Mar 2024 21:50:23 -0600 Subject: [PATCH 08/10] fix: Always uses size_t when comparing with an unsigned int --- src/bootstrap/bootstrap.cc | 8 ++++---- src/data/pq.cc | 2 +- src/validate/semantic.cc | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bootstrap/bootstrap.cc b/src/bootstrap/bootstrap.cc index d4c2d6ca2..869a94c8d 100644 --- a/src/bootstrap/bootstrap.cc +++ b/src/bootstrap/bootstrap.cc @@ -271,7 +271,7 @@ Bootstrap::threadBootstrapWayTask(WayTask wayTask) auto wayval = std::make_shared>>(); // Proccesing ways - for (int i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) { + for (size_t i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) { if (i < ways->size()) { auto way = ways->at(i); wayval->push_back(validator->checkWay(way, "building")); @@ -309,7 +309,7 @@ Bootstrap::threadBootstrapNodeTask(NodeTask nodeTask) // Proccesing nodes std::vector node_tests = {"building", "natural", "place", "waterway"}; - for (int i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) { + for (size_t i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) { if (i < nodes->size()) { auto node = nodes->at(i); for (auto test_it = std::begin(node_tests); test_it != std::end(node_tests); ++test_it) { @@ -344,7 +344,7 @@ Bootstrap::threadBootstrapRelationTask(RelationTask relationTask) // auto relationval = std::make_shared>>(); // Proccesing relations - for (int i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) { + for (size_t i = taskIndex * page_size; i < (taskIndex + 1) * page_size; ++i) { if (i < relations->size()) { auto relation = relations->at(i); // relationval->push_back(validator->checkRelation(way, "building")); @@ -362,4 +362,4 @@ Bootstrap::threadBootstrapRelationTask(RelationTask relationTask) } -} \ No newline at end of file +} diff --git a/src/data/pq.cc b/src/data/pq.cc index ef7957f03..72c7e8862 100644 --- a/src/data/pq.cc +++ b/src/data/pq.cc @@ -161,7 +161,7 @@ std::string Pq::escapedString(const std::string &s) { std::string newstr; - int i = 0; + size_t i = 0; while (i < s.size()) { // Single quote (') if (s[i] == '\'') { diff --git a/src/validate/semantic.cc b/src/validate/semantic.cc index 12504249c..11bb05dca 100644 --- a/src/validate/semantic.cc +++ b/src/validate/semantic.cc @@ -137,7 +137,7 @@ Semantic::checkNode(const osmobjects::OsmNode &node, const std::string &type, ya auto required_tags = tests.get("required_tags"); std::string key; - int tagexists = 0; + size_t tagexists = 0; status->center = node.point; if (node.tags.count(type)) { @@ -196,7 +196,7 @@ Semantic::checkWay(const osmobjects::OsmWay &way, const std::string &type, yaml: return status; } - int tagexists = 0; + size_t tagexists = 0; if (way.tags.count(type)) { for (auto vit = std::begin(way.tags); vit != std::end(way.tags); ++vit) { if (check_badvalue) { @@ -250,7 +250,7 @@ Semantic::checkRelation(const osmobjects::OsmRelation &relation, const std::stri return status; } - int tagexists = 0; + size_t tagexists = 0; if (relation.tags.count(type)) { for (auto vit = std::begin(relation.tags); vit != std::end(relation.tags); ++vit) { if (check_badvalue) { From ff54e4c1d8ffba1710dbcb0e54529afe6f6899a4 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 2 Apr 2024 23:36:09 -0600 Subject: [PATCH 09/10] fix: Add preceeding slash --- src/replicator/planetreplicator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/replicator/planetreplicator.cc b/src/replicator/planetreplicator.cc index eb24febb7..d7af88608 100644 --- a/src/replicator/planetreplicator.cc +++ b/src/replicator/planetreplicator.cc @@ -103,7 +103,7 @@ std::shared_ptr PlanetReplicator::findRemotePath(const underpassconfi yaml::Yaml yaml; std::string rep_file = ETCDIR; - rep_file += "replicator/planetreplicator.yaml"; + rep_file += "/replicator/planetreplicator.yaml"; yaml.read(rep_file); std::map hashes; From 2383faee502d27e023b83f05f882a1d1b6aae741 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 2 Apr 2024 23:36:47 -0600 Subject: [PATCH 10/10] fix: Validate installs the config file too, leading to duplicates in different locations --- Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7c35fa6fd..ca221ca44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,11 +156,8 @@ install-data-hook: $(MKDIR_P) $(DESTDIR)$(ETCDIR) cp -rvp $(srcdir)/config/priority.geojson $(DESTDIR)$(ETCDIR)/ cp -rvp $(srcdir)/config/replicator $(DESTDIR)$(ETCDIR)/ - cp -rvp $(srcdir)/config/validate $(DESTDIR)$(ETCDIR)/ cp -rvp $(srcdir)/config/stats $(DESTDIR)$(ETCDIR)/ cp -rvp $(srcdir)/config/default.yaml $(DESTDIR)$(ETCDIR)/ - $(MKDIR_P) $(DESTDIR)/$(docdir) - cp -rvp $(srcdir)/docs/*.md $(DESTDIR)/$(docdir) cp -rvp $(srcdir)/setup/service $(DESTDIR)/$(pkglibdir) $(MKDIR_P) $(DESTDIR)$(pkglibdir)/../system cp -rvp $(srcdir)/setup/service/underpass.service $(DESTDIR)$(pkglibdir)/../system/ @@ -182,20 +179,20 @@ PCHFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/stats \ - -I$(top_srcdir)/src/validate \ + -I$(top_srcdir)/src/validate \ -I$(top_srcdir)/src/data PCHHEADERS = \ $(top_srcdir)/src/replicator/planetreplicator.hh \ $(top_srcdir)/src/stats/querystats.hh \ - $(top_srcdir)/src/raw/queryraw.hh \ + $(top_srcdir)/src/raw/queryraw.hh \ $(top_srcdir)/src/replicator/replication.hh \ $(top_srcdir)/src/osm/osmchange.hh \ $(top_srcdir)/src/osm/changeset.hh \ $(top_srcdir)/src/osm/osmobjects.hh \ $(top_srcdir)/src/validate/validate.hh \ $(top_srcdir)/src/utils/geoutil.hh \ - $(top_srcdir)/src/utils/geo.hh \ + $(top_srcdir)/src/utils/geo.hh \ $(top_srcdir)/src/replicator/threads.hh PCHOTHER = \