Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
Date: Wed, 14 Aug 2019 12:15:09
Message-Id: 1565784834.6a7a47eb486af8ef1b3a1e87e87e9c4784075132.amadio@gentoo
1 commit: 6a7a47eb486af8ef1b3a1e87e87e9c4784075132
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 12:11:41 2019 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 12:13:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7a47eb
7
8 net-libs/liblockfile: fix Makefile patch for prefix
9
10 Closes: https://bugs.gentoo.org/692132
11
12 Package-Manager: Portage-2.3.71, Repoman-2.3.17
13 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
14
15 .../liblockfile/files/liblockfile-1.16-makefile.patch | 16 ++++++++--------
16 1 file changed, 8 insertions(+), 8 deletions(-)
17
18 diff --git a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
19 index 656ccd3c494..1994680be77 100644
20 --- a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
21 +++ b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
22 @@ -29,12 +29,12 @@ index 2721b48..798c603 100644
23 install_static: static install_common
24 - install -d -m 755 -g root -p $(libdir)
25 - install -m 644 liblockfile.a $(libdir)
26 -+ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
27 ++ install -d -m 755 -p $(DESTDIR)$(libdir)
28 + install -m 644 liblockfile.a $(DESTDIR)$(libdir)
29
30 install_shared: shared install_static install_common
31 - install -d -m 755 -g root -p $(libdir)
32 -+ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
33 ++ install -d -m 755 -p $(DESTDIR)$(libdir)
34 install -m 755 liblockfile.so \
35 - $(libdir)/liblockfile.so.$(SOVER)
36 - ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
37 @@ -50,17 +50,17 @@ index 2721b48..798c603 100644
38 - install -d -m 755 -g root -p $(mandir)/man1
39 - install -d -m 755 -g root -p $(mandir)/man3
40 - install -m 644 lockfile.h maillock.h $(includedir)
41 -+ install -d -m 755 -g root -p $(DESTDIR)$(includedir)
42 -+ install -d -m 755 -g root -p $(DESTDIR)$(bindir)
43 -+ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man1
44 -+ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man3
45 ++ install -d -m 755 -p $(DESTDIR)$(includedir)
46 ++ install -d -m 755 -p $(DESTDIR)$(bindir)
47 ++ install -d -m 755 -p $(DESTDIR)$(mandir)/man1
48 ++ install -d -m 755 -p $(DESTDIR)$(mandir)/man3
49 + install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
50 if [ "$(MAILGROUP)" != "" ]; then\
51 - install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
52 + install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
53 else \
54 - install -g root -m 755 dotlockfile $(bindir); \
55 -+ install -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
56 ++ install -m 755 dotlockfile $(DESTDIR)$(bindir); \
57 fi
58 - install -m 644 *.1 $(mandir)/man1
59 - install -m 644 *.3 $(mandir)/man3
60 @@ -70,7 +70,7 @@ index 2721b48..798c603 100644
61 install_nfslib: nfslib
62 - install -d -m 755 -g root -p $(nfslockdir)
63 - install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
64 -+ install -d -m 755 -g root -p $(DESTDIR)$(nfslockdir)
65 ++ install -d -m 755 -p $(DESTDIR)$(nfslockdir)
66 + install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
67 if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi