Avoid GNU make extension $(RM) in makefiles.

[pspp-builds.git] / po / automake.mk

diff --git a/po/automake.mk b/po/automake.mk
index 56715e1ebdc8c8acb5834e56f28c2b2c893987a9..a36081c433f4a70091e48c08c7ee656024cab3c7 100644 (file)
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -10,21 +10,24 @@ POTFILE=po/$(DOMAIN).pot
 
 TRANSLATABLE_FILES = $(DIST_SOURCES) $(all_q_sources)
 
-$(POTFILE): $(TRANSLATABLE_FILES)
-       @$(MKDIR_P) po
-       $(XGETTEXT) --directory=$(top_srcdir) $(TRANSLATABLE_FILES) \
-       $(XGETTEXT_OPTIONS) \
+XGETTEXT_OPTIONS = \
        --copyright-holder="$(COPYRIGHT_HOLDER)" \
        --package-name=$(PACKAGE) \
        --package-version=$(VERSION) \
        --msgid-bugs-address=$(MSGID_BUGS_ADDRESS) \
-       --add-comments='TRANSLATORS:' \
-       -o $(POTFILE)
+       --add-comments='TRANSLATORS:'
+
+$(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES)
+       @$(MKDIR_P) po
+       $(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS)    $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@
+       $(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=glade -o $@
 
 
 $(POFILES): $(POTFILE)
-       $(MSGMERGE) $(top_srcdir)/$* $< -o $@
+       $(MSGMERGE) $(top_srcdir)/$@ $< -o $@
+
 
+SUFFIXES += .po .gmo
 .po.gmo:
        @$(MKDIR_P) `dirname $@`
        $(MSGFMT) $< -o $@
@@ -39,12 +42,11 @@ install-data-hook: $(GMOFILES)
          lang=`echo $$f | sed -e 's%po/\(.*\)\.gmo%\1%' ` ; \
          $(INSTALL) -D $$f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
        done
-       
 
 uninstall-hook:
        for f in $(GMOFILES); do \
          lang=`echo $$f | sed -e 's%po/\(.*\)\.gmo%\1%' ` ; \
-         $(RM) $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
+         rm -f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo ; \
        done