From 56384e572d419a48439a90b9481a715a13a109c8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 5 Jan 2014 17:09:11 -0500
Subject: src/lib/: set TEXTDOMAIN differently for internal messages

This allows us to fix the long-standing bug that libremessages forces
TEXTDOMAIN=libretools
---
 src/lib/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/lib/Makefile')

diff --git a/src/lib/Makefile b/src/lib/Makefile
index 4f24ad3..4ed5e4f 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -14,7 +14,13 @@ common.sh: %: %.in %.top Makefile
 	@{ \
 	cat '$*.top' && \
 	echo && \
-	sed -r -e '/encoding problem/d;/LANG=/d' -e 's/mesg=\$$(.)/mesg="$$(_ "$$\1")"/' '$*.in' && \
+	sed -r \
+		-e '/encoding problem/d;/LANG=/d' \
+		-e 's/mesg=\$$(.)/mesg="$$(_ "$$\1")"/' \
+		-e 's/gettext /_l _ /g' \
+		-e "s/^(\s+)(msg|error) '/\1_l \2 '/" \
+		-e 's|lock\(\)\s*\{|lock()\n{|' \
+		'$*.in' && \
 	echo && \
 	cat '$*.bottom' && \
 	:; } > '$@'
-- 
cgit v1.2.3-54-g00ecf


From e3108aeb1e38e9d6b243015344c6b4d856221fb4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 2 Feb 2014 04:16:17 -0500
Subject: src/lib/Makefile: fix extra files from being included in libexecs

---
 src/lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/Makefile')

diff --git a/src/lib/Makefile b/src/lib/Makefile
index 4ed5e4f..495abb1 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,5 +1,5 @@
 copy_files = common.sh.in
-libexecs = $(filter-out librelib,$(wildcard libre*))
+libexecs = $(filter-out librelib,$(progs))
 # include common.sh in libs explicitly, because it might not exist yet
 # when the wildcard is performed
 libs = $(sort $(wildcard *.sh) common.sh)
-- 
cgit v1.2.3-54-g00ecf