← Back to branch summary

~ubuntu-branches/ubuntu/vivid/checkpolicy/vivid

« back to all changes in this revision

Viewing changes to debian/patches/multiarch.patch

  • Committer: Package Import Robot
  • Author(s): Russell Coker
  • Date: 2012-02-28 16:21:32 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20120228162132-hyv5giaj04ag7c0f
Tags: 2.1.8-1
New upstream version, added filename trans rule support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/multiarch.patch
1
 
Index: checkpolicy-2.1.0/Makefile
2
 
===================================================================
3
 
--- checkpolicy-2.1.0.orig/Makefile     2011-12-30 10:52:31.000000000 +0900
4
 
+++ checkpolicy-2.1.0/Makefile  2011-12-30 10:56:31.558470187 +0900
 
1
--- a/Makefile
 
2
+++ b/Makefile
5
3
@@ -4,7 +4,7 @@
6
4
 PREFIX ?= $(DESTDIR)/usr
7
5
 BINDIR ?= $(PREFIX)/bin
11
9
 INCLUDEDIR ?= $(PREFIX)/include
12
10
 TARGETS = checkpolicy checkmodule
13
11
 
14
 
Index: checkpolicy-2.1.0/test/Makefile
15
 
===================================================================
16
 
--- checkpolicy-2.1.0.orig/test/Makefile        2011-12-30 10:59:04.366659283 +0900
17
 
+++ checkpolicy-2.1.0/test/Makefile     2011-12-30 11:00:12.686744558 +0900
 
12
--- a/test/Makefile
 
13
+++ b/test/Makefile
18
14
@@ -3,7 +3,7 @@
19
15
 #
20
16
 PREFIX ?= $(DESTDIR)/usr
23
19
+LIBDIR=$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
24
20
 INCLUDEDIR ?= $(PREFIX)/include
25
21
 
26
 
 CFLAGS ?= -g -Wall -O2 -pipe
 
22
 CFLAGS ?= -g -Wall -W -Werror -O2 -pipe