From 9a6b2871ab8000185254d92d54230e4f24dfd3e2 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Wed, 14 Mar 2012 05:53:40 -0700
Subject: [PATCH] --- yaml --- r: 292300 b: refs/heads/master c:
 33e521acff709d275950ec5bf8dd577d873cd61e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/security/apparmor/Makefile | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b342f53a98cd..6744eb9a3c07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1b4bc2ed94d157f3ed60c17a12b658ccb96a76f
+refs/heads/master: 33e521acff709d275950ec5bf8dd577d873cd61e
diff --git a/trunk/security/apparmor/Makefile b/trunk/security/apparmor/Makefile
index 86103ce5b7a7..7e14edd9ec60 100644
--- a/trunk/security/apparmor/Makefile
+++ b/trunk/security/apparmor/Makefile
@@ -15,7 +15,7 @@ clean-files := capability_names.h rlim_names.h
 # to
 #    [1] = "dac_override",
 quiet_cmd_make-caps = GEN     $@
-cmd_make-caps = echo "static const char *capability_names[] = {" > $@ ;\
+cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\
 	sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \
 	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
 	echo "};" >> $@
@@ -43,7 +43,8 @@ cmd_make-caps = echo "static const char *capability_names[] = {" > $@ ;\
 # to
 # #define AA_FS_RLIMIT_MASK "fsize stack"
 quiet_cmd_make-rlim = GEN     $@
-cmd_make-rlim = echo "static const char *rlim_names[RLIM_NLIMITS] = {" > $@ ;\
+cmd_make-rlim = echo "static const char const *rlim_names[RLIM_NLIMITS] = {" \
+	> $@ ;\
 	sed $< >> $@ -r -n \
 	    -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\
 	echo "};" >> $@ ;\