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