linux-hotplug.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dan Nicholson <dbn.lists@gmail.com>
To: linux-hotplug@vger.kernel.org
Subject: [PATCH] libvolume_id: Make relative symlink when $(libdir) =
Date: Fri, 26 Oct 2007 19:19:20 +0000	[thread overview]
Message-ID: <1193426360-5082-2-git-send-email-dbn.lists@gmail.com> (raw)

When the .so link is not in the same directory as the library, there is
no reason to make an absolute symbolic link.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
---
 extras/volume_id/lib/Makefile |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index b553111..b206854 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -105,7 +105,11 @@ install: all
 	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
 	mkdir -p $(DESTDIR)$(usrlibdir)/
 	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+ifeq ($(libdir),$(usrlibdir))
+	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+else
 	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+endif
 	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install
 
-- 
1.5.3.2


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

             reply	other threads:[~2007-10-26 19:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-26 19:19 Dan Nicholson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-11-07 23:23 [PATCH] libvolume_id: Make relative symlink when $(libdir) = Kay Sievers

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=1193426360-5082-2-git-send-email-dbn.lists@gmail.com \
    --to=dbn.lists@gmail.com \
    --cc=linux-hotplug@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).