[PATCH] Makefile: Do not call ldconfig when DESTDIR is defined

diff --git a/99/f4f3d19426dd5babe3fb0f4315ec81f342a598 b/99/f4f3d19426dd5babe3fb0f4315ec81f342a598
new file mode 100644 (file)
index 0000000..3baa0ed
--- /dev/null
+++ b/99/f4f3d19426dd5babe3fb0f4315ec81f342a598
@@ -0,0 +1,87 @@
+Return-Path: <sojkam1@fel.cvut.cz>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7995740D14A\r
+       for <notmuch@notmuchmail.org>; Thu, 21 Oct 2010 23:01:51 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.9\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id XbEMGL-4uLlu for <notmuch@notmuchmail.org>;\r
+       Thu, 21 Oct 2010 23:01:41 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id DB2B640D149\r
+       for <notmuch@notmuchmail.org>; Thu, 21 Oct 2010 23:01:40 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.4])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id 3C76E19F33E0;\r
+       Fri, 22 Oct 2010 08:01:40 +0200 (CEST)\r
+X-Virus-Scanned: IMAP AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+       by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new,\r
+       port 10044)\r
+       with ESMTP id 8NJbqVbhzw+v; Fri, 22 Oct 2010 08:01:39 +0200 (CEST)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id D7F9C19F33C7;\r
+       Fri, 22 Oct 2010 08:01:38 +0200 (CEST)\r
+Received: from steelpick.2x.cz (note-sojka.felk.cvut.cz [147.32.86.30])\r
+       (Authenticated sender: sojkam1)\r
+       by imap.feld.cvut.cz (Postfix) with ESMTPSA id D1C6BFA007;\r
+       Fri, 22 Oct 2010 08:01:38 +0200 (CEST)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.72)\r
+       (envelope-from <sojkam1@fel.cvut.cz>)\r
+       id 1P9Ah8-0003TI-PV; Fri, 22 Oct 2010 08:01:38 +0200\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Makefile: Do not call ldconfig when DESTDIR is defined\r
+Date: Fri, 22 Oct 2010 08:01:28 +0200\r
+Message-Id: <1287727288-13317-1-git-send-email-sojkam1@fel.cvut.cz>\r
+X-Mailer: git-send-email 1.7.2.3\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 22 Oct 2010 06:01:51 -0000\r
+\r
+If make install is called with non-empty DESTDIR, calling ldconfig has\r
+usually no sense. Without this patch dpkg-buildpackage fails with\r
+\r
+  make[1]: ldconfig: Command not found\r
+\r
+Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>\r
+---\r
+This patch first appeared in id:87ljaf6p51.fsf@steelpick.2x.cz\r
+\r
+ lib/Makefile.local |    2 ++\r
+ 1 files changed, 2 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/lib/Makefile.local b/lib/Makefile.local\r
+index a60ef98..2d36db1 100644\r
+--- a/lib/Makefile.local\r
++++ b/lib/Makefile.local\r
+@@ -36,9 +36,11 @@ SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)\r
+ LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)\r
+ LIBRARY_LINK_FLAG = -shared -Wl,-soname=$(SONAME)\r
+ ifeq ($(LIBDIR_IN_LDCONFIG),1)\r
++ifeq ($(DESTDIR),)\r
+ LIBRARY_INSTALL_POST_COMMAND=ldconfig\r
+ endif\r
+ endif\r
++endif\r
+ \r
+ dir := lib\r
+ extra_cflags += -I$(dir) -fPIC\r
+-- \r
+tg: (f117d80..) t/fix-ldconfig-for-deb (depends on: master)\r