Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / tests / scenes / bin / Makefile

diff --git a/tests/scenes/bin/Makefile b/tests/scenes/bin/Makefile
index 46b18756397b7dd5d0cc4a4503f5a35d0af91c67..d508bbacf5d7c207bc1e3627951b7a7e3c19eac9 100644 (file)
--- a/tests/scenes/bin/Makefile
+++ b/tests/scenes/bin/Makefile
@@ -1,7 +1,7 @@
 CXXFLAGS += -O3
 #CXXFLAGS += -g
 CXXFLAGS += -std=c++11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CXXFLAGS += -O3
 #CXXFLAGS += -g
 CXXFLAGS += -std=c++11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64

-CXXFLAGS += -I../../../libosmium/include
+CXXFLAGS += -I../../../../libosmium/include

 
 OS:=$(shell uname -s)
 ifeq ($(OS),Darwin)
 
 OS:=$(shell uname -s)
 ifeq ($(OS),Darwin)


@@ -24,3 +24,4 @@ osm2wkt: osm2wkt.cc
        $(CXX) $(CXXFLAGS) $(CXXFLAGS_WARNINGS) -o $@ $< $(LDFLAGS) $(LIB_IO)
 
 scenarios: osm2wkt
        $(CXX) $(CXXFLAGS) $(CXXFLAGS_WARNINGS) -o $@ $< $(LDFLAGS) $(LIB_IO)
 
 scenarios: osm2wkt

+       ./make_scenes.sh