From ef4c6c595b0800e97b176f5ef42951bd9142ecdc Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Thu, 22 Aug 2002 13:18:09 +0000
Subject: Improved makefiles

---
 grpmi/po/Makefile | 29 +++++++++++++++++------------
 grpmi/po/ar.po    |  4 ++--
 po/Makefile       | 27 ++++++++++++++++++---------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/grpmi/po/Makefile b/grpmi/po/Makefile
index 8448a01e..acfea5bf 100644
--- a/grpmi/po/Makefile
+++ b/grpmi/po/Makefile
@@ -1,19 +1,21 @@
-PL_FILES = ../grpmi.pl
-PL_CFILES = $(PL_FILES:%=%_.c)
+# the domain name for gettext
+PGOAL = grpmi
 
+# perl files to search translatable strings in
+PL_FILES = ../grpmi.pl
+# C-like files to search translatable strings in
 CFILES = ../curl_download/curl_download.xs ../rpm/grpmi_rpm.xs
 
+PL_CFILES = $(PL_FILES:%=%_.c)
 POFILES = $(shell ls *.po)
 MOFILES = $(POFILES:%.po=%.mo)
 LANGS = $(POFILES:%.po=%)
 
-PREFIX = /usr/local
+PREFIX = $(RPM_BUILD_ROOT)/usr
 DATADIR = $(PREFIX)/share
 LOCALEDIR=$(DATADIR)/locale
 
-CFILES =  ../curl_download/curl_download.xs ../rpm/grpmi_rpm.xs
-
-all: $(MOFILES)
+all: $(PGOAL).pot $(MOFILES)
 
 %.mo: %.po
 	msgfmt -o $@ $<
@@ -24,22 +26,25 @@ $(PL_CFILES): %_.c: %
 %.mo: %.po
 	msgfmt -o $@ $<
 
-merge: grpmi.pot
+merge: $(PGOAL).pot
 	@for n in $(POFILES); do \
 		echo "Merging $$n"; \
 		msgmerge "$$n" $< > "$$n"t; \
 		mv -f "$$n"t "$$n"; \
 	done
 
-grpmi.pot: $(PL_CFILES) $(CFILES)
-	xgettext -F -n --add-comments='-PO' --keyword=_ --language=C -o $@ $(PL_CFILES) $(CFILES)
-	rm $(PL_CFILES)
+$(PGOAL).pot: $(PL_CFILES) $(CFILES)
+	xgettext -F -n --add-comments='-PO' \
+	--keyword=_ --keyword=__ --keyword=N_ \
+	--language=C -o $@ $(PL_CFILES) $(CFILES)
+	@rm -rf $(PL_CFILES)
 
 install:
 	for l in $(LANGS); do \
 		install -d $(LOCALEDIR)/$$l/LC_MESSAGES; \
-		install -m 644 $$l.mo $(LOCALEDIR)/$$l/LC_MESSAGES/grpmi.mo; \
+		install -m 644 $$l.mo $(LOCALEDIR)/$$l/LC_MESSAGES/$(PGOAL).mo; \
 	done
 
 clean:
-	@rm -rf *.mo $(POFILES:%=%t) $(PL_CFILES) grpmi.pot
+	@rm -rf *.mo $(POFILES:%=%t) $(PL_CFILES) $(PGOAL).pot
+
diff --git a/grpmi/po/ar.po b/grpmi/po/ar.po
index a04a9fcd..f796c10c 100644
--- a/grpmi/po/ar.po
+++ b/grpmi/po/ar.po
@@ -344,11 +344,11 @@ msgstr ""
 
 #: ../grpmi.pl_.c:175
 msgid "All requested packages were installed successfully."
-msgstr ""
+msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
 #: ../grpmi.pl_.c:175
 msgid "Everything installed successfully"
-msgstr ""
+msgstr "تم تثبيت كل شئ بنجاح"
 
 #: ../rpm/grpmi_rpm.xs:66
 msgid "Couldn't read RPM config files"
diff --git a/po/Makefile b/po/Makefile
index 4292f24d..0876dfd7 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,15 +1,21 @@
+# the domain name for gettext
+PGOAL = rpmdrake
+
+# perl files to search translatable strings in
 PL_FILES = ../rpmdrake ../edit-urpm-sources.pl ../rpmdrake.pm
-PL_CFILES = $(PL_FILES:%=%_.c)
+# C-like files to search translatable strings in
+#CFILES = 
 
+PL_CFILES = $(PL_FILES:%=%_.c)
 POFILES = $(shell ls *.po)
 MOFILES = $(POFILES:%.po=%.mo)
 LANGS = $(POFILES:%.po=%)
 
-PREFIX = /usr/local
+PREFIX = $(RPM_BUILD_ROOT)/usr
 DATADIR = $(PREFIX)/share
 LOCALEDIR=$(DATADIR)/locale
 
-all: $(MOFILES)
+all: $(PGOAL).pot $(MOFILES)
 
 %.mo: %.po
 	msgfmt -o $@ $<
@@ -20,22 +26,25 @@ $(PL_CFILES): %_.c: %
 %.mo: %.po
 	msgfmt -o $@ $<
 
-merge: rpmdrake.pot
+merge: $(PGOAL).pot
 	@for n in $(POFILES); do \
 		echo "Merging $$n"; \
 		msgmerge "$$n" $< > "$$n"t; \
 		mv -f "$$n"t "$$n"; \
 	done
 
-rpmdrake.pot: $(PL_CFILES)
-	xgettext -F -n --add-comments='-PO' --keyword=_ --language=C -o $@ $(PL_CFILES)
-	rm $(PL_CFILES)
+$(PGOAL).pot: $(PL_CFILES) $(CFILES)
+	xgettext -F -n --add-comments='-PO' \
+	--keyword=_ --keyword=__ --keyword=N_ \
+	--language=C -o $@ $(PL_CFILES) $(CFILES)
+	@rm -rf $(PL_CFILES)
 
 install:
 	for l in $(LANGS); do \
 		install -d $(LOCALEDIR)/$$l/LC_MESSAGES; \
-		install -m 644 $$l.mo $(LOCALEDIR)/$$l/LC_MESSAGES/rpmdrake.mo; \
+		install -m 644 $$l.mo $(LOCALEDIR)/$$l/LC_MESSAGES/$(PGOAL).mo; \
 	done
 
 clean:
-	@rm -rf *.mo $(POFILES:%=%t) $(PL_CFILES) rpmdrake.pot
+	@rm -rf *.mo $(POFILES:%=%t) $(PL_CFILES) $(PGOAL).pot
+
-- 
cgit v1.2.1