| commit | f7bfbdc8727b4ba0a231ed2f8daffbd493a8dbb5 | [log] [tgz] |
|---|---|---|
| author | Simon Kelley <simon@thekelleys.org.uk> | Wed Jun 10 22:31:02 2015 +0100 |
| committer | Simon Kelley <simon@thekelleys.org.uk> | Wed Jun 10 22:31:02 2015 +0100 |
| tree | f385fe15e32a176014ec74c151a44169b4f25c1e | |
| parent | 4918bd550573844441a287a67202a6a3f0f6126a [diff] [blame] |
Merge messages and fix makefile process to do this.
diff --git a/Makefile b/Makefile index 2910320..59750bc 100644 --- a/Makefile +++ b/Makefile
@@ -117,7 +117,7 @@ cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL) merge : - @cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot + @cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile dnsmasq.pot for f in `cd $(PO); echo *.po`; do \ echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \ done