linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: linux-nfs@vger.kernel.org
Subject: [PATCH] osd_login: fix DESTDIR install
Date: Thu, 17 May 2012 01:24:03 -0400	[thread overview]
Message-ID: <1337232243-18088-1-git-send-email-vapier@gentoo.org> (raw)

If the destination dir doesn't exist, the current install fails:
make  install-data-hook
make[4]: Entering directory `/var/tmp/portage/net-fs/nfs-utils-1.2.6/work/nfs-utils-1.2.6/utils/osd_login'
/usr/bin/install -c --mode 755 osd_login /var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login
/usr/bin/install: cannot create regular file ‘/var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login’: No such file or directory
make[4]: *** [install-data-hook] Error 1

Rewrite the code to use automake's existing script support rather
than trying to install the file by hand.

Reported-by: Branko BAdrljica <brankob@avtomatika.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 utils/osd_login/Makefile.am |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
index adc493a..c85584c 100644
--- a/utils/osd_login/Makefile.am
+++ b/utils/osd_login/Makefile.am
@@ -1,12 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-OSD_LOGIN_FILES= osd_login
-
-EXTRA_DIST= $(OSD_LOGIN_FILES)
+# These scripts go in /sbin (not /usr/sbin), and that cannot be
+# overriden at config time.
+sbindir = /sbin
 
-all-local: $(OSD_LOGIN_FILES)
+OSD_LOGIN_FILES= osd_login
 
-install-data-hook:
-	$(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
+sbin_SCRIPTS= osd_login
 
 MAINTAINERCLEANFILES = Makefile.in
-- 
1.7.8.6


             reply	other threads:[~2012-05-17  5:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-17  5:24 Mike Frysinger [this message]
2012-05-17 11:53 ` [PATCH] osd_login: fix DESTDIR install Jim Rees
2012-05-17 12:07   ` Boaz Harrosh
2012-05-17 12:28   ` Steve Dickson
2012-05-17 12:19 ` Boaz Harrosh
2012-05-17 13:09   ` Jim Rees
2012-05-17 13:42     ` Boaz Harrosh
2012-05-17 16:08     ` Mike Frysinger
2012-05-17 12:27 ` Steve Dickson
2012-05-17 12:42   ` NeilBrown

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=1337232243-18088-1-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=linux-nfs@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).