From 512687c3bcb647b014844d63f64f1d1268f931ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Thu, 10 Dec 2015 18:47:36 +0100
Subject: [PATCH] build: merged #21,#22
thanks @darix!
fixes #21,#22
---
lib/lib.mk | 4 +++-
scripts/kresd.apparmor | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/lib.mk b/lib/lib.mk
index 822af51f7..59ef63a7e 100644
--- 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 81fa5a1e3..8ad4c26c6 100644
--- 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>
}
--
GitLab