]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - acl/patches/acl-2.2.39-build.patch
Merge remote-tracking branch 'ms/kernel-3.2'
[people/ms/ipfire-3.x.git] / acl / patches / acl-2.2.39-build.patch
1 diff --git a/include/builddefs.in b/include/builddefs.in
2 index d054a56..10b0cd4 100644
3 --- a/include/builddefs.in
4 +++ b/include/builddefs.in
5 @@ -28,14 +28,14 @@ PKG_RELEASE = @pkg_release@
6 PKG_VERSION = @pkg_version@
7 PKG_PLATFORM = @pkg_platform@
8 PKG_DISTRIBUTION= @pkg_distribution@
9 -PKG_BIN_DIR = @bindir@
10 -PKG_SBIN_DIR = @sbindir@
11 -PKG_LIB_DIR = @libdir@@libdirsuffix@
12 -PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
13 -PKG_INC_DIR = @includedir@
14 -PKG_MAN_DIR = @mandir@
15 -PKG_DOC_DIR = @datadir@/doc/@pkg_name@
16 -PKG_LOCALE_DIR = @datadir@/locale
17 +PKG_BIN_DIR = $(DESTDIR)@bindir@
18 +PKG_SBIN_DIR = $(DESTDIR)@sbindir@
19 +PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
20 +PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
21 +PKG_INC_DIR = $(DESTDIR)@includedir@
22 +PKG_MAN_DIR = $(DESTDIR)@mandir@
23 +PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
24 +PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale
25
26 CC = @cc@
27 AWK = @awk@
28 diff --git a/include/buildmacros b/include/buildmacros
29 index 17423c0..3118a17 100644
30 --- a/include/buildmacros
31 +++ b/include/buildmacros
32 @@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
33 $(LFILES:.l=.o) \
34 $(YFILES:%.y=%.tab.o)
35
36 -INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
37 +INSTALL = $(TOPDIR)/include/install-sh
38
39 SHELL = /bin/sh
40 IMAGES_DIR = $(TOPDIR)/all-images