aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-04-01 16:37:46 +0200
committerTimo Teräs <timo.teras@iki.fi>2020-04-01 19:14:28 +0300
commit47053ede6b3ab5356054f8e14bac7eb3c03e09d1 (patch)
tree5e81ed13ff43ddc15162603fb10e0282085c4aa0
parentd6c54f932054c58aee8f7a6d2bd49b115d804da1 (diff)
downloadapk-tools-47053ede6b3ab5356054f8e14bac7eb3c03e09d1.tar.bz2
apk-tools-47053ede6b3ab5356054f8e14bac7eb3c03e09d1.tar.xz
build: fix includedir in pkgconfig fileHEADmaster
We want to include via <apk/$headerfile> and not via <$headerfile>, so we want to add an include statement for the dir the apk folder which contains the headers is contained in.
-rw-r--r--Makefile2
-rw-r--r--src/Makefile4
-rw-r--r--src/apk.pc.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6ea5bc8..9451450 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ LIBDIR := /lib
CONFDIR := /etc/apk
MANDIR := /usr/share/man
DOCDIR := /usr/share/doc/apk
-INCLUDEDIR := /usr/include/apk
+INCLUDEDIR := /usr/include
PKGCONFIGDIR := /usr/lib/pkgconfig
export DESTDIR SBINDIR LIBDIR CONFDIR MANDIR DOCDIR INCLUDEDIR PKGCONFIGDIR
diff --git a/src/Makefile b/src/Makefile
index 6bf2ed0..37c29a2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -114,8 +114,8 @@ install: $(obj)/apk $(libapk_so) $(libapk_a) $(apklua_so)
$(install-libapk_so)
$(install-libapk_a)
$(install-apklua_so)
- $(INSTALLDIR) $(DESTDIR)$(INCLUDEDIR)
- $(INSTALL) -m644 src/*.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALLDIR) $(DESTDIR)$(INCLUDEDIR)/apk
+ $(INSTALL) -m644 src/*.h $(DESTDIR)$(INCLUDEDIR)/apk
$(INSTALLDIR) $(DESTDIR)$(PKGCONFIGDIR)
$(INSTALL) -m644 $(obj)/apk.pc $(DESTDIR)$(PKGCONFIGDIR)
diff --git a/src/apk.pc.in b/src/apk.pc.in
index c7020b3..d9b05cb 100644
--- a/src/apk.pc.in
+++ b/src/apk.pc.in
@@ -7,4 +7,4 @@ Description: Alpine Package Manager
Version: @VERSION@
Requires: zlib openssl
Libs: -L${libdir} -lapk
-Cflags: -I${includedir}/apk
+Cflags: -I${includedir}