From patchwork Mon Jun 24 08:40:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Genoud X-Patchwork-Id: 253734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id AF31F2C0426 for ; Mon, 24 Jun 2013 18:42:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BACB0A01A9; Mon, 24 Jun 2013 08:42:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bRohno13WP5b; Mon, 24 Jun 2013 08:41:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D7A32A01D2; Mon, 24 Jun 2013 08:41:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0DE0E8F7AC for ; Mon, 24 Jun 2013 08:41:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B89728ABBB for ; Mon, 24 Jun 2013 08:41:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SArkdgF41tK3 for ; Mon, 24 Jun 2013 08:41:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by whitealder.osuosl.org (Postfix) with ESMTPS id EA24B8B257 for ; Mon, 24 Jun 2013 08:41:18 +0000 (UTC) Received: by mail-wg0-f46.google.com with SMTP id c11so7937215wgh.13 for ; Mon, 24 Jun 2013 01:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=nrnsyC86EKWoVrx6qG9agBW+TDaGkLawBfa9fxd9DU8=; b=RE9klLsp3Z9b5+wOPvmmk2sRALLq6bmWMSLMPr2AIYOZYU4+Da2GdkG5hljii5HB8T e1XjRH6uldlQIUNUbnCuEQ55sCIxQJkiQ6S4YdNg42wJUtaqhxGl7plGUHXFx8EBJ6RC YdrZnlBYobKlO74w7WrbILRxHcUMzBI0i6nQwRjkHQtgrSKMnnOUamkQ+CVWHIHLosa9 HsI1OMcUbTYw6TYhte7YzEDqHhR+xAcyxYV3oU9HYsWVbGNVvIUfx9b1QcaRdjA60vl4 juzHRudxdqEe0xBuClDfQg5liawfNsGVfKM1zyyBn+jkZn4b3EyK7Ca51olxUqCTa4Td ncrw== X-Received: by 10.180.109.48 with SMTP id hp16mr5294905wib.24.1372063277471; Mon, 24 Jun 2013 01:41:17 -0700 (PDT) Received: from lnx-rg.pr (lyon.paratronic.fr. [213.41.177.106]) by mx.google.com with ESMTPSA id m3sm14877450wij.5.2013.06.24.01.41.14 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Jun 2013 01:41:16 -0700 (PDT) From: Richard Genoud To: buildroot@busybox.net Date: Mon, 24 Jun 2013 10:40:52 +0200 Message-Id: <1372063256-23292-2-git-send-email-richard.genoud@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372063256-23292-1-git-send-email-richard.genoud@gmail.com> References: <1371743610-17810-1-git-send-email-richard.genoud@gmail.com> <1372063256-23292-1-git-send-email-richard.genoud@gmail.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCHv3 1/5] tcl: use make conditions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net As suggested by Thomas Petazzoni, make conditions should be used rather than shell condition in Makefiles. Signed-off-by: Richard Genoud --- package/tcl/tcl.mk | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 0c8fa33..fc62abd 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -24,15 +24,22 @@ HOST_TCL_CONF_OPT = \ define TCL_POST_INSTALL_CLEANUP -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so - -if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \ - rm -Rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*; \ - fi - -if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" = "y" ]; then \ - rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR); \ - fi endef - TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP +ifeq ($(BR2_PACKAGE_TCL_DEL_ENCODINGS),y) +define TCL_REMOVE_ENCODINGS + rm -rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/* +endef +TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_ENCODINGS +endif + +ifeq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y) +define TCL_REMOVE_TCLSH + rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR) +endef +TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_TCLSH +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package))