From patchwork Fri Sep 6 21:39:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Laurence J. Lane" X-Patchwork-Id: 273341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 838132C0107 for ; Sat, 7 Sep 2013 07:39:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750805Ab3IFVjs (ORCPT ); Fri, 6 Sep 2013 17:39:48 -0400 Received: from ankh.ljlane.net ([71.19.149.249]:46596 "EHLO ankh.ljlane.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750758Ab3IFVjr (ORCPT ); Fri, 6 Sep 2013 17:39:47 -0400 Received: by ankh.ljlane.net (Postfix, from userid 1000) id 1A2152B08C; Fri, 6 Sep 2013 17:39:41 -0400 (EDT) From: "Laurence J. Lane" To: netfilter-devel@vger.kernel.org Cc: "Laurence J. Lane" Subject: [iptables PATCH] build: add DESTDIR to vx_bin_links Date: Fri, 6 Sep 2013 17:39:00 -0400 Message-Id: <1378503540-16134-1-git-send-email-ljlane@debian.org> X-Mailer: git-send-email 1.8.4.rc3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Fixes dangling symlinks when using DESTDIR. Signed-off-by: Laurence J. Lane --- iptables/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables/Makefile.am b/iptables/Makefile.am index a4246eb..ec53443 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -49,6 +49,6 @@ pkgconfig_DATA = xtables.pc install-exec-hook: -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi; ${INSTALL} -dm0755 "${DESTDIR}${bindir}"; - for i in ${vx_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done; + for i in ${vx_bin_links}; do ${LN_S} -f "${DESTDIR}${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done; for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;