public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Guilherme Amadio" <amadio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
Date: Wed, 14 Aug 2019 12:15:03 +0000 (UTC)	[thread overview]
Message-ID: <1565784834.6a7a47eb486af8ef1b3a1e87e87e9c4784075132.amadio@gentoo> (raw)

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	other threads:[~2019-08-14 12:15 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-14 12:15 Guilherme Amadio [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-11-28  1:08 [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/ Sam James
2020-11-28  0:52 Sam James
2020-05-06 11:51 Joonas Niilola
2017-09-15  5:45 Benda XU

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565784834.6a7a47eb486af8ef1b3a1e87e87e9c4784075132.amadio@gentoo \
    --to=amadio@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox