| Andrew Geissler | 9b4d8b0 | 2021-02-19 12:26:16 -0600 | [diff] [blame] | 1 | The creation of the LINGUAS file is duplicated for each desktop file |
| 2 | which can lead the commands to race against each other. Rework |
| 3 | the makefile to avoid this as the expense of leaving the file on disk. |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | RP 2021/2/15 |
| 7 | |
| 8 | Index: git/src/po/Makefile |
| 9 | =================================================================== |
| 10 | --- git.orig/src/po/Makefile |
| 11 | +++ git/src/po/Makefile |
| 12 | @@ -165,17 +165,16 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../ |
| 13 | po/gvim.desktop.in po/vim.desktop.in |
| 14 | mv -f ../$(PACKAGE).po $(PACKAGE).pot |
| 15 | |
| 16 | -vim.desktop: vim.desktop.in $(POFILES) |
| 17 | +LINGUAS: |
| 18 | echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS |
| 19 | + |
| 20 | +vim.desktop: vim.desktop.in $(POFILES) LINGUAS |
| 21 | $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop |
| 22 | - rm -f LINGUAS |
| 23 | if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi |
| 24 | mv tmp_vim.desktop vim.desktop |
| 25 | |
| 26 | -gvim.desktop: gvim.desktop.in $(POFILES) |
| 27 | - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS |
| 28 | +gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS |
| 29 | $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop |
| 30 | - rm -f LINGUAS |
| 31 | if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi |
| 32 | mv tmp_gvim.desktop gvim.desktop |
| 33 | |