Makefile: Configure database directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/.gitignore b/.gitignore
index acb026f5fe6679a084ce5b6089d07a0d56ad1759..6d9114d288ccc7a63446066135d3e08487ee8b35 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ Makefile.in
 /configure
 /libtool
 /stamp-h1
+/src/python/location-query
 /test.db

diff --git a/Makefile.am b/Makefile.am
index ebbb0e57c58ca740c07946c0b5e3bac31e9cb205..161f5d38458020abbdfb25966674ca1f53add68c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,11 +27,13 @@ SED_PROCESS = \
        -e 's,@exec_prefix\@,$(exec_prefix),g' \
        -e 's,@libdir\@,$(libdir),g' \
        -e 's,@includedir\@,$(includedir),g' \
+       -e 's,@databasedir\@,$(databasedir),g' \
        < $< > $@ || rm $@
 
+databasedir = $(datadir)/location
 pkgconfigdir = $(libdir)/pkgconfig
 
-%.pc: %.pc.in Makefile
+%: %.in Makefile
        $(SED_PROCESS)
 
 EXTRA_DIST += \
@@ -115,6 +117,12 @@ src_python_location_la_LIBADD = \
 bin_SCRIPTS = \
        src/python/location-query
 
+EXTRA_DIST += \
+       src/python/location-query.in
+
+CLEANFILES += \
+       src/python/location-query
+
 TESTS_CFLAGS = \
        $(AM_CFLAGS) \
        -DLIBLOC_PRIVATE

diff --git a/src/python/location-query b/src/python/location-query.in
similarity index 98%
rename from src/python/location-query
rename to src/python/location-query.in
index 9b5ea94a74c670f288b19f3a6dc0698a0bd10883..260f4bd88abe0102629d98006c0f338377551c7e 100644 (file)
--- a/src/python/location-query
+++ b/src/python/location-query.in
@@ -30,7 +30,7 @@ _ = lambda x: x
 class CLI(object):
        def __init__(self):
                # Open database
-               self.db = location.Database("test.db")
+               self.db = location.Database("@databasedir@/database.db")
 
        def parse_cli(self):
                parser = argparse.ArgumentParser(