Merge 'master' into 'gtk3'.

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 99b729f61c7c3e5d67bd0e587f82e08fc3f4fca5..b19ea4b3f99748172a59951fe78084fe1d992a94 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -345,6 +345,9 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/pspp.desktop
 
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
+
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
        $(nodist_src_ui_gui_psppire_DATA)