Make sources around that we can run tests without location installed

In order to run the test suite, we need to make the Python module
loadable from the build directory so that we first of all test the right
code and that it just works without running "make install" first.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

.gitignore

@@ -15,9 +15,8 @@ Makefile.in
 /*.db.xz
 /libtool
 /stamp-h1
-/src/python/location
-/src/python/location-importer
-/src/python/__init__.py
+/src/scripts/location
+/src/scripts/location-importer
 /src/systemd/location-update.service
 /src/systemd/location-update.timer
 /test.db

Makefile.am

@@ -175,21 +175,13 @@ CLEANFILES += \
 	src/libloc.pc
 
 dist_pkgpython_PYTHON = \
-	src/python/database.py \
-	src/python/downloader.py \
-	src/python/export.py \
-	src/python/i18n.py \
-	src/python/importer.py \
-	src/python/logger.py
-
-pkgpython_PYTHON = \
-	src/python/__init__.py
-
-EXTRA_DIST += \
-	src/python/__init__.py.in
-
-CLEANFILES += \
-	src/python/__init__.py
+	src/python/location/__init__.py \
+	src/python/location/database.py \
+	src/python/location/downloader.py \
+	src/python/location/export.py \
+	src/python/location/i18n.py \
+	src/python/location/importer.py \
+	src/python/location/logger.py
 
 pyexec_LTLIBRARIES = \
 	src/python/_location.la
@@ -275,16 +267,16 @@ uninstall-perl:
 		$(DESTDIR)/$(prefix)/man/man3/Location.3pm
 
 bin_SCRIPTS = \
-	src/python/location \
-	src/python/location-importer
+	src/scripts/location \
+	src/scripts/location-importer
 
 EXTRA_DIST += \
-	src/python/location.in \
-	src/python/location-importer.in
+	src/scripts/location.in \
+	src/scripts/location-importer.in
 
 CLEANFILES += \
-	src/python/location \
-	src/python/location-importer
+	src/scripts/location \
+	src/scripts/location-importer
 
 # ------------------------------------------------------------------------------
 
@@ -321,6 +313,7 @@ TESTS_LDADD = \
 	src/libloc-internal.la
 
 TESTS_ENVIRONMENT = \
+	PYTHONPATH=$(abs_srcdir)/src/python:$(abs_builddir)/src/python/.libs \
 	TEST_DATA_DIR="$(abs_top_srcdir)/tests/data"
 
 TESTS = \
@@ -334,7 +327,7 @@ CLEANFILES += \
 	testdata.db
 
 testdata.db: examples/python/create-database.py
-	PYTHONPATH=$(abs_builddir)/src/python/.libs \
+	PYTHONPATH=$(abs_srcdir)/src/python:$(abs_builddir)/src/python/.libs \
 	ABS_SRCDIR="$(abs_srcdir)" \
 		$(PYTHON) $< $@
 

po/POTFILES.in

 src/libloc.pc.in
-src/python/__init__.py.in
-src/python/database.py
-src/python/downloader.py
-src/python/export.py
-src/python/i18n.py
-src/python/importer.py
-src/python/location-importer.in
-src/python/location.in
-src/python/logger.py
+src/python/location/__init__.py
+src/python/location/database.py
+src/python/location/downloader.py
+src/python/location/export.py
+src/python/location/i18n.py
+src/python/location/importer.py
+src/python/location/logger.py
+src/scripts/location-importer.in
+src/scripts/location.in
 src/systemd/location-update.service.in
 src/systemd/location-update.timer.in

src/python/__init__.py.in → src/python/location/__init__.py

@@ -17,8 +17,6 @@
 #                                                                             #
 ###############################################################################
 
-__version__ = "@VERSION@"
-
 # Import everything from the C module
 from _location import *