jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix includedir in pkgconfig file 

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.
cute-signatures
Rasmus Thomsen 2020-04-01 16:37:46 +02:00 committed by Timo Teräs
parent d6c54f9320
commit 47053ede6b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -17,7 +17,7 @@ LIBDIR := /lib
CONFDIR := /etc/apk CONFDIR := /etc/apk
MANDIR := /usr/share/man MANDIR := /usr/share/man
DOCDIR := /usr/share/doc/apk DOCDIR := /usr/share/doc/apk
INCLUDEDIR := /usr/include/apk INCLUDEDIR := /usr/include
PKGCONFIGDIR := /usr/lib/pkgconfig PKGCONFIGDIR := /usr/lib/pkgconfig
export DESTDIR SBINDIR LIBDIR CONFDIR MANDIR DOCDIR INCLUDEDIR PKGCONFIGDIR export DESTDIR SBINDIR LIBDIR CONFDIR MANDIR DOCDIR INCLUDEDIR PKGCONFIGDIR

4
src/Makefile
View File

@ -114,8 +114,8 @@ install: $(obj)/apk $(libapk_so) $(libapk_a) $(apklua_so)
$(install-libapk_so) $(install-libapk_so)
$(install-libapk_a) $(install-libapk_a)
$(install-apklua_so) $(install-apklua_so)
$(INSTALLDIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALLDIR) $(DESTDIR)$(INCLUDEDIR)/apk
$(INSTALL) -m644 src/*.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL) -m644 src/*.h $(DESTDIR)$(INCLUDEDIR)/apk
$(INSTALLDIR) $(DESTDIR)$(PKGCONFIGDIR) $(INSTALLDIR) $(DESTDIR)$(PKGCONFIGDIR)
$(INSTALL) -m644 $(obj)/apk.pc $(DESTDIR)$(PKGCONFIGDIR) $(INSTALL) -m644 $(obj)/apk.pc $(DESTDIR)$(PKGCONFIGDIR)

2
src/apk.pc.in
View File

@ -7,4 +7,4 @@ Description: Alpine Package Manager
Version: @VERSION@ Version: @VERSION@
Requires: zlib openssl Requires: zlib openssl
Libs: -L${libdir} -lapk Libs: -L${libdir} -lapk
Cflags: -I${includedir}/apk Cflags: -I${includedir}