kc3-lang/libbsd

diff --git a/Makefile b/Makefile
index c359acb..ca7cb0e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ LIB_VERSION_MINOR := 3
 LIB_VERSION_MICRO := 0
 LIB_VERSION := $(LIB_VERSION_MAJOR).$(LIB_VERSION_MINOR).$(LIB_VERSION_MICRO)
 
-LIB_PKGCONFIG := $(LIB_NAME).pc
-LIB_PKGCONFIG_OVERLAY := $(LIB_NAME)-overlay.pc
+LIB_PKGCONFIG := src/$(LIB_NAME).pc
+LIB_PKGCONFIG_OVERLAY := src/$(LIB_NAME)-overlay.pc
 LIB_STATIC := $(LIB_NAME).a
 LIB_SHARED_SO := $(LIB_NAME).so
 LIB_SONAME := $(LIB_SHARED_SO).$(LIB_VERSION_MAJOR)
@@ -184,7 +184,7 @@ $(LIB_SHARED): $(LIB_SHARED_OBJS)
 	$(LINK) \
 	  -shared \
 	  -Wl,-soname -Wl,$(LIB_SONAME) \
-	  -Wl,--version-script=libbsd.map \
+	  -Wl,--version-script=src/libbsd.map \
 	  -o $@ $^
 
 .PHONY: ChangeLog
diff --git a/libbsd-overlay.pc.in b/libbsd-overlay.pc.in
deleted file mode 100644
index 2bbb1e2..0000000
--- a/libbsd-overlay.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libbsd
-Description: Utility functions from BSD systems (overlay)
-Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
-Libs: -L${libdir} -lbsd
-Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
diff --git a/libbsd.map b/libbsd.map
deleted file mode 100644
index 39e6ea9..0000000
--- a/libbsd.map
+++ /dev/null
@@ -1,91 +0,0 @@
-LIBBSD_0.0 {
-  global:
-    arc4random;
-    arc4random_stir;
-    arc4random_addrandom;
-
-    bsd_getopt;
-    optreset;
-
-    errc;
-    warnc;
-    verrc;
-    vwarnc;
-
-    fgetln;
-    fmtcheck;
-    heapsort;
-    humanize_number;
-
-    inet_net_pton; /* XXX: Already provided by glibc, remove. */
-
-    getprogname;
-    setprogname;
-
-    strlcpy;
-    strlcat;
-
-    setmode;
-    getmode;
-
-    vis;
-    strvis;
-    strvisx;
-    unvis;
-    strunvis;
-    strunvisx;
-
-    MD5Init;
-    MD5Update;
-    MD5Pad;
-    MD5Final;
-    MD5Transform;
-    MD5End;
-    MD5File;
-    MD5FileChunk;
-    MD5Data;
-
-  local:
-    *;
-};
-
-LIBBSD_0.1 {
-    strmode;
-
-    __fdnlist; /* Private symbol, but libkvm uses it. */
-    nlist;
-} LIBBSD_0.0;
-
-LIBBSD_0.2 {
-    strtonum;
-
-    strnvis;
-    strnunvis;
-
-    dehumanize_number;
-
-    readpassphrase;
-
-    flopen;
-
-    pidfile_open;
-    pidfile_write;
-    pidfile_close;
-    pidfile_remove;
-
-    setproctitle;
-
-    arc4random_buf;
-    arc4random_uniform;
-} LIBBSD_0.1;
-
-LIBBSD_0.3 {
-    reallocf;
-    getpeereid;
-
-    mergesort;
-    radixsort;
-    sradixsort;
-
-    fpurge;
-} LIBBSD_0.2;
diff --git a/libbsd.pc.in b/libbsd.pc.in
deleted file mode 100644
index 9f97323..0000000
--- a/libbsd.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libbsd
-Description: Utility functions from BSD systems
-Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
-Libs: -L${libdir} -lbsd
-Cflags: -I${includedir}
diff --git a/src/libbsd-overlay.pc.in b/src/libbsd-overlay.pc.in
new file mode 100644
index 0000000..2bbb1e2
--- /dev/null
+++ b/src/libbsd-overlay.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libbsd
+Description: Utility functions from BSD systems (overlay)
+Version: @VERSION@
+URL: http://libbsd.freedesktop.org/
+Libs: -L${libdir} -lbsd
+Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
diff --git a/src/libbsd.map b/src/libbsd.map
new file mode 100644
index 0000000..39e6ea9
--- /dev/null
+++ b/src/libbsd.map
@@ -0,0 +1,91 @@
+LIBBSD_0.0 {
+  global:
+    arc4random;
+    arc4random_stir;
+    arc4random_addrandom;
+
+    bsd_getopt;
+    optreset;
+
+    errc;
+    warnc;
+    verrc;
+    vwarnc;
+
+    fgetln;
+    fmtcheck;
+    heapsort;
+    humanize_number;
+
+    inet_net_pton; /* XXX: Already provided by glibc, remove. */
+
+    getprogname;
+    setprogname;
+
+    strlcpy;
+    strlcat;
+
+    setmode;
+    getmode;
+
+    vis;
+    strvis;
+    strvisx;
+    unvis;
+    strunvis;
+    strunvisx;
+
+    MD5Init;
+    MD5Update;
+    MD5Pad;
+    MD5Final;
+    MD5Transform;
+    MD5End;
+    MD5File;
+    MD5FileChunk;
+    MD5Data;
+
+  local:
+    *;
+};
+
+LIBBSD_0.1 {
+    strmode;
+
+    __fdnlist; /* Private symbol, but libkvm uses it. */
+    nlist;
+} LIBBSD_0.0;
+
+LIBBSD_0.2 {
+    strtonum;
+
+    strnvis;
+    strnunvis;
+
+    dehumanize_number;
+
+    readpassphrase;
+
+    flopen;
+
+    pidfile_open;
+    pidfile_write;
+    pidfile_close;
+    pidfile_remove;
+
+    setproctitle;
+
+    arc4random_buf;
+    arc4random_uniform;
+} LIBBSD_0.1;
+
+LIBBSD_0.3 {
+    reallocf;
+    getpeereid;
+
+    mergesort;
+    radixsort;
+    sradixsort;
+
+    fpurge;
+} LIBBSD_0.2;
diff --git a/src/libbsd.pc.in b/src/libbsd.pc.in
new file mode 100644
index 0000000..9f97323
--- /dev/null
+++ b/src/libbsd.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libbsd
+Description: Utility functions from BSD systems
+Version: @VERSION@
+URL: http://libbsd.freedesktop.org/
+Libs: -L${libdir} -lbsd
+Cflags: -I${includedir}