From 40dc57fb41205c80f5ab69023669efb31edf840d Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 13 Aug 2012 20:33:13 -0700 Subject: [PATCH] glib: Don't install m4 macros Freedesktop #52031 --- glib-patches/no-installed-files.patch | 10 ++++++++++ glib/m4macros/Makefile.am | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/glib-patches/no-installed-files.patch b/glib-patches/no-installed-files.patch index 60039bf..004c6c2 100644 --- a/glib-patches/no-installed-files.patch +++ b/glib-patches/no-installed-files.patch @@ -161,3 +161,13 @@ index 6fb3a34..1cf80a2 100644 - -uninstall-gdb: - -rm -r $(DESTDIR)$(datadir)/gdb +diff --git a/glib/m4macros/Makefile.am b/glib/m4macros/Makefile.am +index 75a9ca0..10a2f5f 100644 +--- a/glib/m4macros/Makefile.am ++++ b/glib/m4macros/Makefile.am +@@ -5,4 +5,4 @@ installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4 + EXTRA_DIST+=$(installed_m4) + + m4datadir = $(datadir)/aclocal +-m4data_DATA = $(installed_m4) ++noinst_DATA = $(installed_m4) diff --git a/glib/m4macros/Makefile.am b/glib/m4macros/Makefile.am index 75a9ca0..10a2f5f 100644 --- a/glib/m4macros/Makefile.am +++ b/glib/m4macros/Makefile.am @@ -5,4 +5,4 @@ installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4 EXTRA_DIST+=$(installed_m4) m4datadir = $(datadir)/aclocal -m4data_DATA = $(installed_m4) +noinst_DATA = $(installed_m4)