2
0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00

Move nls targets to the top level Makefile so the paths in

the pot file are saner
This commit is contained in:
Todd C. Miller
2011-06-04 18:27:13 -04:00
parent e8064e25dd
commit e66169b3ed
10 changed files with 78 additions and 148 deletions

View File

@@ -83,10 +83,6 @@ Makefile: $(srcdir)/Makefile.in
sample_plugin.la: $(OBJS)
$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LTLDFLAGS) -o $@ $(OBJS) $(LIBS) -module -export-symbols $(srcdir)/sample_plugin.sym -avoid-version -rpath $(plugindir)
update-po:
compile-po:
pre-install:
install: install-dirs install-plugin
@@ -103,8 +99,6 @@ install-doc:
install-plugin: install-dirs sample_plugin.la
$(INSTALL) -b~ -M 0755 .libs/sample_plugin$(soext) $(DESTDIR)$(plugindir)
install-nls:
uninstall:
-rm -f $(DESTDIR)$(plugindir)/sample_plugin$(soext)

View File

@@ -83,10 +83,6 @@ Makefile: $(srcdir)/Makefile.in
sample_group.la: $(OBJS)
$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LTLDFLAGS) -o $@ $(OBJS) $(LIBS) -module -export-symbols $(srcdir)/sample_group.sym -avoid-version -rpath $(plugindir)
update-po:
compile-po:
pre-install:
install: install-dirs install-plugin
@@ -103,8 +99,6 @@ install-doc:
install-plugin: install-dirs sample_group.la
$(INSTALL) -b~ -M 0755 .libs/sample_group$(soext) $(DESTDIR)$(plugindir)
install-nls:
uninstall:
-rm -f $(DESTDIR)$(plugindir)/sample_group$(soext)

View File

@@ -38,8 +38,6 @@ CC = @CC@
LIBTOOL = @LIBTOOL@
FLEX = @FLEX@
YACC = @YACC@
ECHO_N = @ECHO_N@
ECHO_C = @ECHO_C@
# Our install program supports extra flags...
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
@@ -137,20 +135,6 @@ LIBOBJDIR = $(top_builddir)/@ac_config_libobj_dir@/
VERSION = @PACKAGE_VERSION@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
# Message catalog support
LINGUAS = @LINGUAS@
POTFILE = $(srcdir)/po/sudoers.pot
MSGFMT = msgfmt
MSGMERGE = msgmerge
XGETTEXT = xgettext
XGETTEXT_OPTS = -k_ -kN_ -dsudoers --copyright-holder="Todd C. Miller" \
"--msgid-bugs-address=http://www.sudo.ws/bugs" \
--package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
--flag warning:1:c-format --flag warningx:1:c-format \
--flag error:2:c-format --flag errorx:2:c-format \
--flag easprintf:3:c-format --flag lbuf_append:2:c-format \
--flag lbuf_append_quoted:3:c-format --foreign-user
all: $(PROGS)
.SUFFIXES: .o .c .h .l .y .lo
@@ -226,34 +210,13 @@ $(devdir)/getdate.c: $(srcdir)/getdate.y
sudoers: $(srcdir)/sudoers.in
(cd $(top_builddir) && $(SHELL) config.status --file=plugins/sudoers/$@)
update-po:
@echo "Updating $(POTFILE)"; \
$(XGETTEXT) $(XGETTEXT_OPTS) $(srcdir)/*c $(srcdir)/auth/*c -o $(POTFILE)
@set -- $(LINGUAS); \
while test $$# != 0; do \
echo $(ECHO_N) "Updating \"$$1\" message catalog$(ECHO_C)"; \
$(MSGMERGE) --update $(srcdir)/po/$$1.po $(POTFILE); \
$(MSGFMT) --output /dev/null --check-format $(srcdir)/po/$$1.po || exit 1; \
shift; \
done
compile-po:
@if test -n "$(LINGUAS)"; then \
set -- $(LINGUAS); \
while test $$# != 0; do \
echo "Compiling \"$$1\" message catalog."; \
$(MSGFMT) --statistics -c -o $(srcdir)/po/$$1.mo $(srcdir)/po/$$1.po; \
shift; \
done; \
fi
pre-install:
@if test -r $(DESTDIR)$(sudoersdir)/sudoers; then \
echo "Checking existing sudoers file for syntax errors."; \
./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
fi
install: install-dirs install-plugin install-binaries install-sudoers install-doc install-nls
install: install-dirs install-plugin install-binaries install-sudoers install-doc
install-dirs:
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) \
@@ -280,20 +243,6 @@ install-sudoers: install-dirs
$(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
sudoers $(DESTDIR)$(sudoersdir)/sudoers
install-nls:
@if test -n "$(LINGUAS)"; then \
echo $(ECHO_N) "Installing sudoers message catalogs:$(ECHO_C)"; \
fi; \
set -- $(LINGUAS); \
while test $$# != 0; do \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$1/LC_MESSAGES; \
$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0644 $(srcdir)/po/$$1.mo $(DESTDIR)$(localedir)/$$1/LC_MESSAGES/sudoers.mo; \
shift; \
done; \
if test -n "$(LINGUAS)"; then \
echo ""; \
fi
uninstall:
-rm -f $(DESTDIR)$(plugindir)/sudoers$(soext)
-rm -f $(DESTDIR)$(replaydir)/sudoreplay