From 70b0988a8cf5e4f08bcf8b99e276452a27765854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= Date: Tue, 20 Jan 2015 23:12:58 -0500 Subject: [PATCH] dist: fix appdata for the second time ... and I'm not even sure this is the right way --- Makefile.am | 1 + data/Makefile.am | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1045c271..208f5045 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = src data po +DIST_SUBDIRS = src data po INTLTOOL_FILES = \ intltool-extract.in \ diff --git a/data/Makefile.am b/data/Makefile.am index da3117e5..f4550629 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,6 +4,11 @@ desktopdir = $(datadir)/applications desktop_in_files = org.gnome.Calendar.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_XML_RULE@ +appdatadir = $(datadir)/appdata +appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_in_files = appdata/org.gnome.Calendar.appdata.xml.in + @INTLTOOL_DESKTOP_RULE@ servicedir = $(datadir)/dbus-1/services @@ -28,14 +33,9 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) .PRECIOUS: $(gsettings_SCHEMAS) @INTLTOOL_XML_NOMERGE_RULE@ -@GSETTINGS_RULES@ - -@INTLTOOL_XML_RULE@ -appdatadir = $(datadir)/appdata -appdata_DATA = $(appdata_in_files:.xml.in=.xml) -appdata_in_files = appdata/org.gnome.Calendar.appdata.xml.in EXTRA_DIST= \ + appdata/org.gnome.Calendar.appdata.xml \ org.gnome.Calendar.desktop \ calendar.gresource.xml \ ui/date-selector.ui \