commit:     6a7a47eb486af8ef1b3a1e87e87e9c4784075132
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 12:11:41 2019 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 12:13:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7a47eb

net-libs/liblockfile: fix Makefile patch for prefix

Closes: https://bugs.gentoo.org/692132

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 .../liblockfile/files/liblockfile-1.16-makefile.patch    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch 
b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
index 656ccd3c494..1994680be77 100644
--- a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
+++ b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
@@ -29,12 +29,12 @@ index 2721b48..798c603 100644
  install_static:       static install_common
 -              install -d -m 755 -g root -p $(libdir)
 -              install -m 644 liblockfile.a $(libdir)
-+              install -d -m 755 -g root -p $(DESTDIR)$(libdir)
++              install -d -m 755 -p $(DESTDIR)$(libdir)
 +              install -m 644 liblockfile.a $(DESTDIR)$(libdir)
  
  install_shared:       shared install_static install_common
 -              install -d -m 755 -g root -p $(libdir)
-+              install -d -m 755 -g root -p $(DESTDIR)$(libdir)
++              install -d -m 755 -p $(DESTDIR)$(libdir)
                install -m 755 liblockfile.so \
 -                      $(libdir)/liblockfile.so.$(SOVER)
 -              ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
@@ -50,17 +50,17 @@ index 2721b48..798c603 100644
 -              install -d -m 755 -g root -p $(mandir)/man1
 -              install -d -m 755 -g root -p $(mandir)/man3
 -              install -m 644 lockfile.h maillock.h $(includedir)
-+              install -d -m 755 -g root -p $(DESTDIR)$(includedir)
-+              install -d -m 755 -g root -p $(DESTDIR)$(bindir)
-+              install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man1
-+              install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man3
++              install -d -m 755 -p $(DESTDIR)$(includedir)
++              install -d -m 755 -p $(DESTDIR)$(bindir)
++              install -d -m 755 -p $(DESTDIR)$(mandir)/man1
++              install -d -m 755 -p $(DESTDIR)$(mandir)/man3
 +              install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
                if [ "$(MAILGROUP)" != "" ]; then\
 -                install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
 +                install -g $(MAILGROUP) -m 2755 dotlockfile 
$(DESTDIR)$(bindir);\
                else \
 -                install -g root -m 755 dotlockfile $(bindir); \
-+                install -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
++                install -m 755 dotlockfile $(DESTDIR)$(bindir); \
                fi
 -              install -m 644 *.1 $(mandir)/man1
 -              install -m 644 *.3 $(mandir)/man3
@@ -70,7 +70,7 @@ index 2721b48..798c603 100644
  install_nfslib:       nfslib
 -              install -d -m 755 -g root -p $(nfslockdir)
 -              install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+              install -d -m 755 -g root -p $(DESTDIR)$(nfslockdir)
++              install -d -m 755 -p $(DESTDIR)$(nfslockdir)
 +              install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
                if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
  

Reply via email to