1 files changed, 15 insertions, 13 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 4842527..b7b61a2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,16 @@
 SUBDIRS = pixmaps icons
 
-DESKTOP_IN_FILES= eom.desktop.in.in
-DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
-
 desktopdir = $(datadir)/applications
-desktop_DATA = $(DESKTOP_FILES)
-$(desktop_DATA): $(DESKTOP_IN_FILES)
+desktop_DATA = eom.desktop
+desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
+desktop_in_in_files = $(desktop_in_files:.desktop.in=.desktop.in.in)
+$(desktop_DATA): $(desktop_in_files)
 $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 
 appdatadir = $(datadir)/metainfo
-appdata_in_files = eom.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_DATA = eom.appdata.xml
+appdata_in_files = $(appdata_DATA:.xml=.xml.in)
+appdata_in_in_files = $(appdata_in_files:.xml.in=.xml.in.in)
 $(appdata_DATA): $(appdata_in_files)
 $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
@@ -29,7 +29,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = eom.pc
 
 EXTRA_DIST = \
- $(ui_DATA) \
+ $(ui_DATA) \
 eom.css \
 eom-image-properties-dialog.ui \
 eom-multiple-save-as-dialog.ui \
@@ -37,14 +37,16 @@ EXTRA_DIST = \
 eom-ui.xml \
 metadata-sidebar.ui \
 eom.about \
- $(DESKTOP_IN_FILES) \
- $(appdata_in_files)
+ $(appdata_in_in_files) \
+ $(desktop_in_in_files)
 
 CLEANFILES = \
- $(appdata_DATA)
+ $(appdata_DATA) \
+ $(desktop_DATA)
 
 DISTCLEANFILES = \
- $(DESKTOP_FILES) \
- $(gsettings_SCHEMAS)
+ $(appdata_in_files) \
+ $(desktop_in_files) \
+ $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk