build: merged #21,#22

thanks @darix!
fixes #21,#22

diff --git a/lib/lib.mk b/lib/lib.mk
index 822af51f78f356b1d02227c56a64caf4c8259e84..59ef63a7e513544f5689ade4ceb41a8879959ed6 100644 (file)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -41,6 +41,7 @@ libkres_HEADERS := \
 # Dependencies
 libkres_DEPEND := $(contrib)
 libkres_CFLAGS := -fvisibility=hidden -fPIC
+libkres_LDFLAGS := -fvisibility=hidden -fPIC
 libkres_LIBS := $(contrib_TARGET) $(libknot_LIBS) $(libdnssec_LIBS)
 libkres_TARGET := -L$(abspath lib) -lkres
 
@@ -64,7 +65,8 @@ libkres.pc:
        @echo 'Libs: -L$${libdir} -lkres' >> $@
        @echo 'Cflags: -I$${includedir}' >> $@
 libkres-pcinstall: libkres.pc libkres-install
-       $(INSTALL) -m 644 $< $(DESTDIR)$(LIBDIR)/pkgconfig
+       $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/
+       $(INSTALL)    -m 644 $< $(DESTDIR)$(LIBDIR)/pkgconfig/
 
 # Targets
 lib: $(libkres)

diff --git a/scripts/kresd.apparmor b/scripts/kresd.apparmor
index 81fa5a1e3b73908c1fce9d2c51c89a739c6be4a8..8ad4c26c661ff2486a94ce2689a92df6de1df653 100644 (file)
--- a/scripts/kresd.apparmor
+++ b/scripts/kresd.apparmor
@@ -26,5 +26,7 @@
   /usr/lib{,64}/kdns_modules/tinyweb/ r,
   /usr/lib{,64}/kdns_modules/tinyweb/* r,
   /var/lib/GeoIP/* r,
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.kresd>
 }