Move include files to /usr/include/libloc

There was a discrepancy between the paths in the build environment and
the installed headers which could not be included in any third-party
software.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Makefile.am

@@ -90,20 +90,20 @@ EXTRA_DIST += \
 	examples/python/read-database.py
 
 pkginclude_HEADERS = \
-	src/loc/libloc.h \
-	src/loc/as.h \
-	src/loc/as-list.h \
-	src/loc/compat.h \
-	src/loc/country.h \
-	src/loc/country-list.h \
-	src/loc/database.h \
-	src/loc/format.h \
-	src/loc/network.h \
-	src/loc/network-list.h \
-	src/loc/private.h \
-	src/loc/stringpool.h \
-	src/loc/resolv.h \
-	src/loc/writer.h
+	src/libloc/libloc.h \
+	src/libloc/as.h \
+	src/libloc/as-list.h \
+	src/libloc/compat.h \
+	src/libloc/country.h \
+	src/libloc/country-list.h \
+	src/libloc/database.h \
+	src/libloc/format.h \
+	src/libloc/network.h \
+	src/libloc/network-list.h \
+	src/libloc/private.h \
+	src/libloc/stringpool.h \
+	src/libloc/resolv.h \
+	src/libloc/writer.h
 
 lib_LTLIBRARIES = \
 	src/libloc.la

src/as-list.c

@@ -17,9 +17,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <loc/as.h>
-#include <loc/as-list.h>
-#include <loc/private.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/private.h>
 
 struct loc_as_list {
 	struct loc_ctx* ctx;

src/as.c

@@ -24,12 +24,12 @@
 #  include <endian.h>
 #endif
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/compat.h>
-#include <loc/format.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/compat.h>
+#include <libloc/format.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
 
 struct loc_as {
 	struct loc_ctx* ctx;

src/country-list.c

@@ -17,9 +17,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <loc/country.h>
-#include <loc/country-list.h>
-#include <loc/private.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
+#include <libloc/private.h>
 
 struct loc_country_list {
 	struct loc_ctx* ctx;

src/country.c

@@ -18,10 +18,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/private.h>
 
 struct loc_country {
 	struct loc_ctx* ctx;

src/database.c

@@ -36,18 +36,18 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/as-list.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/country-list.h>
-#include <loc/database.h>
-#include <loc/format.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
+#include <libloc/database.h>
+#include <libloc/format.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
 
 struct loc_database {
 	struct loc_ctx* ctx;

src/libloc.c

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/compat.h>
+#include <libloc/private.h>
 
 struct loc_ctx {
 	int refcount;

src/loc/as-list.h → src/libloc/as-list.h

@@ -17,8 +17,8 @@
 #ifndef LIBLOC_AS_LIST_H
 #define LIBLOC_AS_LIST_H
 
-#include <loc/as.h>
-#include <loc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/libloc.h>
 
 struct loc_as_list;
 

src/loc/as.h → src/libloc/as.h

@@ -19,9 +19,9 @@
 
 #include <stdint.h>
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/stringpool.h>
 
 struct loc_as;
 int loc_as_new(struct loc_ctx* ctx, struct loc_as** as, uint32_t number);

src/loc/country-list.h → src/libloc/country-list.h

@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#include <loc/libloc.h>
-#include <loc/country.h>
+#include <libloc/libloc.h>
+#include <libloc/country.h>
 
 struct loc_country_list;
 

src/loc/country.h → src/libloc/country.h

@@ -17,9 +17,9 @@
 #ifndef LIBLOC_COUNTRY_H
 #define LIBLOC_COUNTRY_H
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/stringpool.h>
 
 struct loc_country;
 int loc_country_new(struct loc_ctx* ctx, struct loc_country** country, const char* country_code);

src/loc/database.h → src/libloc/database.h

@@ -21,11 +21,11 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/as.h>
-#include <loc/country.h>
-#include <loc/country-list.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/as.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
 
 struct loc_database;
 int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, FILE* f);

src/loc/network-list.h → src/libloc/network-list.h

@@ -17,7 +17,7 @@
 #ifndef LIBLOC_NETWORK_LIST_H
 #define LIBLOC_NETWORK_LIST_H
 
-#include <loc/network.h>
+#include <libloc/network.h>
 
 struct loc_network_list;
 int loc_network_list_new(struct loc_ctx* ctx, struct loc_network_list** list);

src/loc/network.h → src/libloc/network.h

@@ -19,9 +19,9 @@
 
 #include <netinet/in.h>
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/network-list.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/network-list.h>
 
 enum loc_network_flags {
 	LOC_NETWORK_FLAG_ANONYMOUS_PROXY    = (1 << 0), // A1

src/loc/private.h → src/libloc/private.h

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 static inline void __attribute__((always_inline, format(printf, 2, 3)))
 loc_log_null(struct loc_ctx *ctx, const char *format, ...) {}

src/loc/resolv.h → src/libloc/resolv.h

@@ -19,7 +19,7 @@
 
 #include <time.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 int loc_discover_latest_version(struct loc_ctx* ctx, unsigned int version, time_t* t);
 

src/loc/stringpool.h → src/libloc/stringpool.h

@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 struct loc_stringpool;
 int loc_stringpool_new(struct loc_ctx* ctx, struct loc_stringpool** pool);

src/loc/writer.h → src/libloc/writer.h

@@ -19,11 +19,11 @@
 
 #include <stdio.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/network.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/country.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
 
 struct loc_writer;
 

src/network-list.c

@@ -18,9 +18,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/private.h>
 
 struct loc_network_list {
 	struct loc_ctx* ctx;

src/network.c

@@ -25,12 +25,12 @@
 #  include <endian.h>
 #endif
 
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
+#include <libloc/private.h>
 
 struct loc_network {
 	struct loc_ctx* ctx;

src/perl/Location.xs

@@ -6,10 +6,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/network.h>
-#include <loc/country.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
+#include <libloc/country.h>
 
 MODULE = Location		PACKAGE = Location
 

src/python/as.c

@@ -16,8 +16,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
 
 #include "locationmodule.h"
 #include "as.h"

src/python/as.h

@@ -19,8 +19,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
 
 typedef struct {
 	PyObject_HEAD

src/python/country.c

@@ -16,8 +16,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/country.h>
+#include <libloc/libloc.h>
+#include <libloc/country.h>
 
 #include "locationmodule.h"
 #include "country.h"

src/python/country.h

@@ -19,8 +19,7 @@
 
 #include <Python.h>
 
-//#include <loc/libloc.h>
-#include <loc/country.h>
+#include <libloc/country.h>
 
 typedef struct {
 	PyObject_HEAD

src/python/database.c

@@ -16,10 +16,10 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/as-list.h>
-#include <loc/database.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/database.h>
 
 #include "locationmodule.h"
 #include "as.h"

src/python/database.h

@@ -19,7 +19,7 @@
 
 #include <Python.h>
 
-#include <loc/database.h>
+#include <libloc/database.h>
 
 typedef struct {
 	PyObject_HEAD

src/python/locationmodule.c

@@ -17,8 +17,8 @@
 #include <Python.h>
 #include <syslog.h>
 
-#include <loc/format.h>
-#include <loc/resolv.h>
+#include <libloc/format.h>
+#include <libloc/resolv.h>
 
 #include "locationmodule.h"
 #include "as.h"

src/python/locationmodule.h

@@ -17,8 +17,7 @@
 #ifndef PYTHON_LOCATION_MODULE_H
 #define PYTHON_LOCATION_MODULE_H
 
-#include <loc/libloc.h>
-#include <loc/as.h>
+#include <libloc/libloc.h>
 
 extern struct loc_ctx* loc_ctx;
 

src/python/network.c

@@ -19,9 +19,9 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
 
 #include "locationmodule.h"
 #include "network.h"

src/python/network.h

@@ -19,7 +19,7 @@
 
 #include <Python.h>
 
-#include <loc/network.h>
+#include <libloc/network.h>
 
 typedef struct {
 	PyObject_HEAD

src/python/writer.c

@@ -16,8 +16,8 @@
 
 #include <Python.h>
 
-#include <loc/libloc.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/writer.h>
 
 #include "locationmodule.h"
 #include "as.h"

src/python/writer.h

@@ -19,7 +19,7 @@
 
 #include <Python.h>
 
-#include <loc/writer.h>
+#include <libloc/writer.h>
 
 typedef struct {
 	PyObject_HEAD

src/resolv.c

@@ -20,9 +20,9 @@
 #include <string.h>
 #include <time.h>
 
-#include <loc/format.h>
-#include <loc/private.h>
-#include <loc/resolv.h>
+#include <libloc/format.h>
+#include <libloc/private.h>
+#include <libloc/resolv.h>
 
 static int parse_timestamp(const unsigned char* txt, time_t* t) {
     struct tm ts;

src/stringpool.c

@@ -22,10 +22,10 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <loc/libloc.h>
-#include <loc/format.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/format.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
 
 enum loc_stringpool_mode {
 	STRINGPOOL_DEFAULT,

src/test-as.c

@@ -19,9 +19,9 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/writer.h>
 
 #define TEST_AS_COUNT 5000
 

src/test-country.c

@@ -21,11 +21,11 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/network.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/country.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
+#include <libloc/writer.h>
 
 int main(int argc, char** argv) {
 	struct loc_country* country;

src/test-database.c

@@ -24,9 +24,9 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/writer.h>
 
 const char* VENDOR = "Test Vendor";
 const char* DESCRIPTION =

src/test-libloc.c

@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
+#include <libloc/libloc.h>
 
 int main(int argc, char** argv) {
 	struct loc_ctx *ctx;

src/test-network-list.c

@@ -21,9 +21,9 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/network.h>
-#include <loc/network-list.h>
+#include <libloc/libloc.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
 
 int main(int argc, char** argv) {
 	int err;

src/test-network.c

@@ -22,10 +22,10 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/network.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/network.h>
+#include <libloc/writer.h>
 
 int main(int argc, char** argv) {
 	int err;

src/test-signature.c

@@ -24,9 +24,9 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/database.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/database.h>
+#include <libloc/writer.h>
 
 int main(int argc, char** argv) {
 	int err;

src/test-stringpool.c

@@ -26,8 +26,8 @@
 #include <time.h>
 #include <syslog.h>
 
-#include <loc/libloc.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/stringpool.h>
 
 static const char* characters = "012345789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 

src/writer.c

@@ -31,15 +31,15 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/format.h>
-#include <loc/network.h>
-#include <loc/private.h>
-#include <loc/writer.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/database.h>
+#include <libloc/format.h>
+#include <libloc/network.h>
+#include <libloc/private.h>
+#include <libloc/writer.h>
 
 struct loc_writer {
 	struct loc_ctx* ctx;