← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to po/Makefile.in.in

  • Committer: Brian Aker
  • Date: 2009-11-25 07:05:58 UTC
  • mfrom: (1192.3.39 pandora-build)
  • Revision ID: brian@gaz-20091125070558-mzf1m5etiwb841jb
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
po/Makefile.in.in
150
150
        fi; \
151
151
        case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
152
152
          '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
153
 
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
 
153
            $(XGETTEXT) --omit-header --no-location --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
154
154
              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
155
155
              --files-from=$(srcdir)/POTFILES.in \
156
156
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
157
157
              --msgid-bugs-address="$$msgid_bugs_address" \
158
158
            ;; \
159
159
          *) \
160
 
            $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
 
160
            $(XGETTEXT) --omit-header --no-location --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
161
161
              --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
162
162
              --files-from=$(srcdir)/POTFILES.in \
163
163
              --copyright-holder='$(COPYRIGHT_HOLDER)' \
193
193
        @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
194
194
        if test -f "$(srcdir)/$${lang}.po"; then \
195
195
          test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
196
 
          echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
197
 
          cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
 
196
          echo "$${cdcmd}$(MSGMERGE_UPDATE) --no-location $${lang}.po $(DOMAIN).pot"; \
 
197
          cd $(srcdir) && $(MSGMERGE_UPDATE) --no-location $${lang}.po $(DOMAIN).pot; \
198
198
        else \
199
199
          $(MAKE) $${lang}.po-create; \
200
200
        fi
395
395
        tmpdir=`pwd`; \
396
396
        echo "$$lang:"; \
397
397
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
398
 
        echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 
398
        echo "$${cdcmd}$(MSGMERGE) --no-location $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
399
399
        cd $(srcdir); \
400
 
        if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
 
400
        if $(MSGMERGE) --no-location $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
401
401
          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
402
402
            rm -f $$tmpdir/$$lang.new.po; \
403
403
          else \