From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from gallifrey.ext.pengutronix.de
	([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=localhost)
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <jbe@pengutronix.de>) id 1Sq8TW-0001pG-BJ
	for ptxdist@pengutronix.de; Sat, 14 Jul 2012 21:57:58 +0200
From: Juergen Beisert <jbe@pengutronix.de>
Date: Sat, 14 Jul 2012 21:57:57 +0200
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <201207142157.57591.jbe@pengutronix.de>
Subject: [ptxdist] [PATCH] wireshark: Fix targetinstall stage
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

When tshark is not enabled the targetinstall stage must not try to install it.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/rules/wireshark.make b/rules/wireshark.make
index 13fb818..fbf666f 100644
--- a/rules/wireshark.make
+++ b/rules/wireshark.make
@@ -81,8 +81,9 @@ $(STATEDIR)/wireshark.targetinstall:
 #
 	@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/capinfos)
 	@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap)
-	@$(call install_copy, wireshark, 0, 0, 0755, -, \
-		/usr/bin/tshark)
+ifdef PTXCONF_WIRESHARK_TSHARK
+	@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/tshark)
+endif
 #
 # libraries used by some of the executables
 #

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de