acl package changes to support I18N.

4 files changed, 12 insertions, 203 deletions

diff --git a/po/Make.rules b/po/Make.rules
deleted file mode 100644
index 3f320a1..0000000
--- a/po/Make.rules
+++ /dev/null
@@ -1,48 +0,0 @@
-.PHONY : po
-
-LINGUAS := de
-X_FILES := src/getfacl.c src/setfacl.c src/do_set.c libacl/acl_error.c
-
-all :: $(LINGUAS:%=po/%.mo)
-
-%.mo: %.po
-	@if test -n "$(MSGFMT)" ; then \
-		echo "$(MSGFMT) -o $@ $<" ; \
-		$(MSGFMT) -o $@ $< ; \
-	else \
-		rm -f $@ ; \
-	fi
-
-# xgettext doesn't process C preprocessor statements correctly
-# in the version I have, so...
-
-po ::
-	( for F in $(X_FILES) ; do \
-	  cpp -I. $$F ; done ) | \
-	xgettext --omit-header --language=C -o po/acl.pot -
-	for CC in $(LINGUAS) ; do \
-		msgmerge -o po/$$CC.po po/$$CC.po po/acl.pot ; \
-	done
-
-clean ::
-	rm -f $(LINGUAS:%=po/%.mo)
-
-distclean ::
-	rm -f $(LINGUAS:%=po/%.mo)
-
-install ::
-	@for CC in $(LINGUAS) ; do \
-		if test -e po/$$CC.mo ; then \
-			TO_DIR=$(ROOT)$(gnulocaledir)/$$CC/LC_MESSAGES ; \
-			TO_FILE=$$TO_DIR/$(PACKAGE).mo ; \
-			$(INSTALL) -d $$TO_DIR ; \
-			$(INSTALL) -m 644 po/$$CC.mo $$TO_FILE ; \
-		fi ; \
-	done
-
-uninstall ::
-	@for CC in $(LINGUAS) ; do \
-		TO_FILE=$(ROOT)$(gnulocaledir)/$$CC/LC_MESSAGES/$(PACKAGE).mo ; \
-		echo $$TO_FILE ; \
-		rm -f $$TO_FILE ; \
-	done
diff --git a/po/Makefile b/po/Makefile
index ea99cbc..2ccd1ac 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -34,10 +34,19 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
 LINGUAS = de
+LSRCFILES = $(LINGUAS:%=%.po)
 
-LSRCFILES = Make.rules POTFILES.in acl.pot de.po
-LDIRT = $(LINGUAS:%=%.mo)
+XGETTEXTFILES =	$(TOPDIR)/chacl/chacl.c \
+		$(TOPDIR)/setfacl/do_set.c \
+		$(TOPDIR)/setfacl/setfacl.c \
+		$(TOPDIR)/getfacl/getfacl.c \
+		$(TOPDIR)/libacl/acl_error.c
+
+default: $(LINGUAS:%=%.mo)
 
 include $(BUILDRULES)
 
-default install install-dev install-lib:
+install: default
+	$(INSTALL_LINGUAS)
+
+install-dev install-lib:
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 9af6b93..0000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# List of source files containing translatable strings.
-# Copyright (C) Andreas Gruenbacher, <ag@computer.org>
-
-# Libacl library files
-libacl/acl_error.c
-
-# Package source files
-src/getfacl.c
-src/setfacl.c
-src/do_set.c
-
diff --git a/po/acl.pot b/po/acl.pot
index 03b31d2..e69de29 100644
--- a/po/acl.pot
+++ b/po/acl.pot
@@ -1,141 +0,0 @@
-#, c-format
-msgid "%s: Removing leading '/' from absolute path names\n"
-msgstr ""
-
-#, c-format
-msgid "%s %s -- get file access control lists\n"
-msgstr ""
-
-#, c-format
-msgid "Usage: %s [-%s] file ...\n"
-msgstr ""
-
-msgid "  -d, --default           display the default access control list\n"
-msgstr ""
-
-msgid ""
-"  -a, --access            display the file access control list only\n"
-"  -d, --default           display the default access control list only\n"
-"      --omit-header       do not display the comment header\n"
-"      --all-effective     print all effective rights\n"
-"      --no-effective      print no effective rights\n"
-"      --skip-base         skip files that only have the base entries\n"
-"  -R, --recursive         recurse into subdirectories\n"
-"      --post-order        visit subdirectories first\n"
-"  -L, --logical           logical walk, follow symbolic links\n"
-"  -P  --physical          physical walk, do not follow symbolic links\n"
-"      --tabular           use tabular output format\n"
-"      --absolute-names    don't strip leading '/' in pathnames\n"
-msgstr ""
-
-msgid ""
-"  -v, --version           print version and exit\n"
-"  -h, --help              this help text\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Standard input: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Try `%s -h' for more information.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s: No filename found in line %d, aborting\n"
-msgstr ""
-
-#, c-format
-msgid "%s: No filename found in line %d of standard input, aborting\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s: %s in line %d\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s: Cannot change owner/group: %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s %s -- set file access control lists\n"
-msgstr ""
-
-#, c-format
-msgid "Usage: %s %s\n"
-msgstr ""
-
-msgid ""
-"      --set=acl           set the ACL of file(s), replacing the current ACL\n"
-"      --set-file=file     read ACL entries to set from file\n"
-"      --mask              do recalculate the effective rights mask\n"
-msgstr ""
-
-msgid ""
-"  -m, --modify=acl        modify the current ACL(s) of file(s)\n"
-"  -M, --modify-file=file  read ACL entries to modify from file\n"
-"  -x, --remove=acl        remove entries from the ACL(s) of file(s)\n"
-"  -X, --remove-file=file  read ACL entries to remove from file\n"
-"  -b, --remove-all        remove all extended ACL entries\n"
-"  -k, --remove-default    remove the default ACL\n"
-msgstr ""
-
-msgid ""
-"  -n, --no-mask           don't recalculate the effective rights mask\n"
-"  -d, --default           operations apply to the default ACL\n"
-msgstr ""
-
-msgid ""
-"  -R, --recursive         recurse into subdirectories\n"
-"      --post-order        visit subdirectories first\n"
-"  -L, --logical           logical walk, follow symbolic links\n"
-"  -P, --physical          physical walk, do not follow symbolic links\n"
-"      --restore=file      restore ACLs (inverse of `getfacl -R')\n"
-"      --test              test mode (ACLs are not modified)\n"
-msgstr ""
-
-msgid "[-bkndRLPvh] { -s|-S|-m|-M|-x|-X ... } file ..."
-msgstr ""
-
-msgid "[-bkndvh] {-m|-M|-x|-X ... } file ..."
-msgstr ""
-
-#, c-format
-msgid "%s: Option -%c incomplete\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Option -%c: %s near character %d\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s in line %d of file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s in line %d of standard input\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s: Malformed ACL `%s': %s at entry %d\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s: Malformed default ACL `%s': %s at entry %d\n"
-msgstr ""
-
-#, c-format
-msgid "%s: %s: Only directories can have default ACLs\n"
-msgstr ""
-
-msgid "Multiple entries"
-msgstr ""
-
-msgid "Duplicate entries"
-msgstr ""
-
-msgid "Missing or wrong entry"
-msgstr ""
-
-msgid "Invalid entry type"
-msgstr ""