From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Lars Pedersen <lapeddk@gmail.com>
Date: Mon, 26 Aug 2019 11:54:07 +0200
Message-Id: <20190826095407.8995-1-lapeddk@gmail.com>
In-Reply-To: <20190807105032.33jorssrz2s676lh@pengutronix.de>
References: <20190807105032.33jorssrz2s676lh@pengutronix.de>
MIME-Version: 1.0
Subject: [ptxdist] [PATCH v2] gettext: add envsubst option
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/cgi-bin/mailman/private/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>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: m.olbrich@pengutronix.de, Lars Pedersen <lapeddk@gmail.com>

For environment variable templating

Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
---
v2: Fix prompt spacing and remove default line
 rules/gettext.in   | 15 +++++++++++++--
 rules/gettext.make |  4 ++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/rules/gettext.in b/rules/gettext.in
index 5b971f7d1..dc0573912 100644
--- a/rules/gettext.in
+++ b/rules/gettext.in
@@ -1,7 +1,7 @@
 ## SECTION=system_libraries
-config GETTEXT
+menuconfig GETTEXT
 	tristate
-	prompt "gettext (gnu)"
+	prompt "gettext (gnu)                 "
 	select LIBC_M
 	select LIBC_DL
 	select GCCLIBS_CXX
@@ -10,3 +10,14 @@ config GETTEXT
 	  The gettext program translates a natural language
 	  message into the user's language, by looking up
 	  the translation in a message catalog.
+
+
+if GETTEXT
+
+config GETTEXT_ENVSUBST
+	bool
+	prompt "envsubst"
+	help
+	  Substitutes environment variables in shell format strings
+
+endif
diff --git a/rules/gettext.make b/rules/gettext.make
index 0bda25c96..dd1d22ffb 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -71,6 +71,10 @@ $(STATEDIR)/gettext.targetinstall:
 	@$(call install_fixup, gettext,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, gettext,DESCRIPTION,missing)
 
+ifdef PTXCONF_GETTEXT_ENVSUBST
+	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/envsubst)
+endif
+
 	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/xgettext)
 	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/gettext)
 
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de