diff options
| author | Daiki Ueno <dueno@src.gnome.org> | 2017-12-13 15:07:22 +0100 |
|---|---|---|
| committer | Daiki Ueno <dueno@src.gnome.org> | 2017-12-13 15:12:31 +0100 |
| commit | d4c51867ff274473b50783e639bdd3fb5a983245 (patch) | |
| tree | d42e1aa4a33ae6247ed4e6b560d072e24681ee4f | |
| parent | 35a01f8c6eaf3c991aaeb3f66449f41d3f0580bc (diff) | |
| download | gnome-keyring-d4c51867ff274473b50783e639bdd3fb5a983245.tar.gz | |
build: Fix issues on desktop file generation
This fixes a couple issues in commit 8818e939:
- intermidiate files are left after "make distcheck"
- to incorporate translations, it didn't properly use a suffix rule
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | daemon/Makefile.am | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index edd30afb..640c0e98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,12 +133,12 @@ SED_SUBST = sed \ -e 's,[@]VERSION[@],$(VERSION),g' \ $(NULL) -SUFFIXES = .desktop.in .desktop.in.in .service .service.in +SUFFIXES = .desktop .desktop.in .desktop.in.in .service .service.in .service.in.service: $(V_SED) ( $(SED_SUBST) $< > $@.tmp ) && mv $@.tmp $@ -.desktop.in.in.desktop.in: +.desktop.in.desktop: $(V_SED) ( $(SED_SUBST) $< > $@.tmp ) && mv $@.tmp $@ all-local: diff --git a/daemon/Makefile.am b/daemon/Makefile.am index aac2313b..3611d42c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -44,11 +44,12 @@ desktop_in_in_files = \ $(NULL) desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -$(desktop_DATA): $(desktop_in_files) +.desktop.in.in.desktop.in: $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST += \ $(service_in_files) \ + $(desktop_in_files) \ $(desktop_in_in_files) CLEANFILES += \ |