50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index ce5b933..d0f98e0 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -37,12 +37,7 @@
|
|
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
|
|
|
|
DIST_SUBDIRS = $(NORMAL_SUBDIRS) browser-plugin
|
|
-DISTCHECK_CONFIGURE_FLAGS = \
|
|
- --disable-scrollkeeper \
|
|
- --enable-gtk-doc \
|
|
- --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' \
|
|
- --enable-introspection \
|
|
- --enable-appdata-validate
|
|
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' --enable-vala=no --enable-introspection
|
|
|
|
# Build ChangeLog from GIT history
|
|
ChangeLog:
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 3dcfc7c..4ec1ec4 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -602,8 +602,6 @@ GNOME_CXX_WARNINGS
|
|
GNOME_MAINTAINER_MODE_DEFINES
|
|
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
|
|
|
-APPDATA_XML
|
|
-
|
|
# This macro expands DIR and assigns it to RET.
|
|
# If DIR is NONE, then it's replaced by DEFAULT.
|
|
# Based on AC_DEFINE_DIR
|
|
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
|
|
index b6e6823..d82e59b 100644
|
|
--- a/data/appdata/Makefile.am
|
|
+++ b/data/appdata/Makefile.am
|
|
@@ -1,9 +1,7 @@
|
|
# AppData
|
|
-@APPDATA_XML_RULES@
|
|
@INTLTOOL_XML_RULE@
|
|
-
|
|
+appdatadir = $(datadir)/appdata
|
|
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
|
|
appdata_in_files = totem.appdata.xml.in
|
|
-appdata_XML = $(appdata_in_files:.xml.in=.xml)
|
|
-
|
|
-EXTRA_DIST = $(appdata_in_files)
|
|
-CLEANFILES = $(appdata_XML)
|
|
+EXTRA_DIST = $(appdata_in_files})
|
|
+CLEANFILES = $(appdata_DATA)
|