From 622757f704c45d0d2011d10bb839c9fbdca1a693 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Wed, 5 Jul 2006 03:52:47 +0000
Subject: Update acl package to better integrate into the Ubuntu localisation
 up-to-dated-ness tracking system (Rosetta). Merge of
 master-melb:xfs-cmds:26416a by kenmcd.

---
 include/builddefs.in |  2 ++
 include/buildrules   | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/builddefs.in b/include/builddefs.in
index c082ea6..db444d5 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -18,6 +18,7 @@ LIBMISC = $(TOPDIR)/libmisc/libmisc.la
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 
 PKG_NAME	= @pkg_name@
 PKG_USER	= @pkg_user@
@@ -49,6 +50,7 @@ MAKEDEPEND	= @makedepend@
 
 MSGFMT		= @msgfmt@
 MSGMERGE	= @msgmerge@
+XGETTEXT	= @xgettext@
 
 RPM		= @rpm@
 RPMBUILD	= @rpmbuild@
diff --git a/include/buildrules b/include/buildrules
index f721283..41aaef5 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -35,15 +35,15 @@ $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
 	$(LTCOMPILE) -c $<
 endif
 
-ifdef LINGUAS
+ifdef POTHEAD
 %.pot: $(XGETTEXTFILES)
-	xgettext --omit-header --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
+	$(XGETTEXT) --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
 
-%.po:
-	$(MSGMERGE) -o $@.tmpo $@ $(PKG_NAME).pot
-	@if ! diff $@.tmpo $@ >/dev/null; then \
-		echo "$@ is out of date, see $@.tmpo"; \
-	fi
+# Generate temp .po files, to check whether translations need updating.
+# Not by default, due to gettext output differences between versions.
+%.po: $(POTHEAD)
+#	$(MSGMERGE) -o $@.tmpo $@ $(POTHEAD)
+#	if ! diff $@.tmpo $@ >/dev/null; then echo "$@ dated, see $@.tmpo"; fi
 
 %.mo: %.po
 	$(MSGFMT) -o $@ $<
-- 
cgit v1.2.1