Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: richard.genoud at gmail.com <richard.genoud@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/6] tcl: use make conditions
Date: Fri, 21 Jun 2013 13:56:58 +0200	[thread overview]
Message-ID: <51c43f9e.ebbbb40a.0abf.ffffba0d@mx.google.com> (raw)
In-Reply-To: <1371815822-29453-1-git-send-email-y>

From: Richard Genoud <richard.genoud@gmail.com>

As suggested by Thomas Petazzoni, make conditions should be used rather
than shell condition in Makefiles.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 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 ad23b80..2526ca1 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_TCLSH)" != "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
+
+ifneq ($(BR2_PACKAGE_TCL_TCLSH),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))
-- 
1.7.10.4

  parent reply	other threads:[~2013-06-21 11:56 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-20 15:53 [Buildroot] [PATCH 0/4] make usb_modeswitch work with udev Richard Genoud
2013-06-20 15:53 ` [Buildroot] [PATCH 1/4] TCL: change BR2_PACKAGE_TCL_SHLIB_ONLY option Richard Genoud
2013-06-20 15:59   ` Thomas Petazzoni
2013-06-20 15:53 ` [Buildroot] [PATCH 2/4] tcl: add a tclsh symlink Richard Genoud
2013-06-20 15:53 ` [Buildroot] [PATCH 3/4] usb_modeswitch: bump to 1.2.6 Richard Genoud
2013-06-20 16:00   ` Thomas Petazzoni
2013-06-20 17:02     ` Richard Genoud
2013-06-20 17:04       ` Gustavo Zacarias
2013-06-20 15:53 ` [Buildroot] [PATCH 4/4] usb_modeswitch_data: bump to 20130610 Richard Genoud
2013-06-21 11:56 ` [Buildroot] [PATCH 0/6] tcl rework (was: make usb_modeswitch work with udev) richard.genoud at gmail.com
     [not found] ` <1371815822-29453-1-git-send-email-y>
2013-06-21 11:56   ` [Buildroot] [PATCH 1/6] tcl: change BR2_PACKAGE_TCL_SHLIB_ONLY option richard.genoud at gmail.com
2013-06-22  9:15     ` Patrick Ziegler
2013-06-24  7:49       ` Richard Genoud
2013-06-21 11:56   ` richard.genoud at gmail.com [this message]
2013-06-21 11:56   ` [Buildroot] [PATCH 3/6] tcl: remove strip command richard.genoud at gmail.com
2013-06-21 11:57   ` [Buildroot] [PATCH 4/6] tcl: install the libtcl into staging richard.genoud at gmail.com
2013-06-21 11:57   ` [Buildroot] [PATCH 5/6] tcl: add a tclsh symlink richard.genoud at gmail.com
2013-06-21 11:57   ` [Buildroot] [PATCH 6/6] tcl: make the libtcl writable in order to be stripped richard.genoud at gmail.com
2013-06-24  8:40 ` [Buildroot] [PATCHv3 0/5] tcl rework (was: make usb_modeswitch work with udev) Richard Genoud
2013-06-24  8:40   ` [Buildroot] [PATCHv3 1/5] tcl: use make conditions Richard Genoud
2013-06-24  8:40   ` [Buildroot] [PATCHv3 2/5] tcl: remove strip command Richard Genoud
2013-06-24  8:40   ` [Buildroot] [PATCHv3 3/5] tcl: install the libtcl into staging Richard Genoud
2013-06-24  8:40   ` [Buildroot] [PATCHv3 4/5] tcl: add a tclsh symlink Richard Genoud
2013-06-24  8:40   ` [Buildroot] [PATCHv3 5/5] tcl: make the libtcl writable in order to be stripped Richard Genoud
2013-07-28 14:29   ` [Buildroot] [PATCHv3 0/5] tcl rework (was: make usb_modeswitch work with udev) Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51c43f9e.ebbbb40a.0abf.ffffba0d@mx.google.com \
    --to=richard.genoud@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox