From patchwork Sat Aug 23 19:24:55 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ben Hutchings <ben@decadent.org.uk>
X-Patchwork-Id: 4769961
Return-Path: <linux-wireless-owner@kernel.org>
X-Original-To: patchwork-linux-wireless@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
	by patchwork2.web.kernel.org (Postfix) with ESMTP id BDD06C0338
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 23 Aug 2014 19:25:08 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
	by mail.kernel.org (Postfix) with ESMTP id 37B1E20158
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 23 Aug 2014 19:25:08 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 5308620138
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 23 Aug 2014 19:25:07 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751473AbaHWTZE (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sat, 23 Aug 2014 15:25:04 -0400
Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:53086 "EHLO
	shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751096AbaHWTZD (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Sat, 23 Aug 2014 15:25:03 -0400
Received: from [131.252.184.246] (helo=deadeye)
	by shadbolt.decadent.org.uk with esmtps
	(TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80)
	(envelope-from <ben@decadent.org.uk>)
	id 1XLGvu-00015U-5Q; Sat, 23 Aug 2014 20:25:02 +0100
Received: from ben by deadeye with local (Exim 4.84_RC2)
	(envelope-from <ben@decadent.org.uk>)
	id 1XLGvn-0008O0-RZ; Sat, 23 Aug 2014 12:24:55 -0700
Message-ID: <1408821895.4672.110.camel@deadeye.wl.decadent.org.uk>
Subject: [PATCH] Do not run ldconfig if DESTDIR is set
From: Ben Hutchings <ben@decadent.org.uk>
To: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Date: Sat, 23 Aug 2014 12:24:55 -0700
X-Mailer: Evolution 3.12.2-1+b1 
Mime-Version: 1.0
X-SA-Exim-Connect-IP: 131.252.184.246
X-SA-Exim-Mail-From: ben@decadent.org.uk
X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk);
	SAEximRunCond expanded to false
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI,
	RP_MATCHES_RCVD, T_TVD_MIME_EPI,
	UNPARSEABLE_RELAY autolearn=ham version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

ldconfig should only be run for a local installation, and will fail when
building as an unprivileged user.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,9 @@ install-libreg:
 	$(NQ) '  INSTALL  libreg'
 	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
 	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+ifndef DESTDIR
 	$(Q)ldconfig
+endif
 
 %.o: %.c regdb.h $(LIBREG)
 	$(NQ) '  CC  ' $@