Marcus Rueckert
f270973a6c
Accepted submit request 57745 from user jeff_mahoney OBS-URL: https://build.opensuse.org/request/show/57745 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=1
36 lines
1.0 KiB
Plaintext
36 lines
1.0 KiB
Plaintext
---
|
|
changehat/mod_apparmor/Makefile | 6 +-----
|
|
changehat/mod_apparmor/mod_apparmor.c | 6 +-----
|
|
2 files changed, 2 insertions(+), 10 deletions(-)
|
|
|
|
--- a/changehat/mod_apparmor/Makefile
|
|
+++ b/changehat/mod_apparmor/Makefile
|
|
@@ -42,11 +42,7 @@ APXS:=$(shell if [ -x "/usr/sbin/apxs2"
|
|
fi )
|
|
APXS_INSTALL_DIR=$(shell ${APXS} -q LIBEXECDIR)
|
|
DESTDIR=
|
|
-LIBAPPARMOR_FLAGS=$(shell if [ -f /usr/lib/libapparmor.so -o -f /usr/lib64/libapparmor.so ] ; then \
|
|
- echo -lapparmor ; \
|
|
- else \
|
|
- echo -DUSE_COMPAT_IMMUNIX_H -limmunix ;\
|
|
- fi)
|
|
+LIBAPPARMOR_FLAGS="-I../../libraries/libapparmor/src -L../../libraries/libapparmor/src/.libs -lapparmor"
|
|
|
|
all: $(TARGET) ${MANPAGES} ${HTMLMANPAGES}
|
|
|
|
--- a/changehat/mod_apparmor/mod_apparmor.c
|
|
+++ b/changehat/mod_apparmor/mod_apparmor.c
|
|
@@ -24,11 +24,7 @@
|
|
#include "apr_strings.h"
|
|
#include "apr_lib.h"
|
|
|
|
-#ifndef USE_COMPAT_IMMUNIX_H
|
|
-#include <sys/apparmor.h>
|
|
-#else
|
|
-#include <sys/immunix.h>
|
|
-#endif
|
|
+#include "apparmor.h"
|
|
#include <unistd.h>
|
|
|
|
/* #define DEBUG */
|