summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2012-08-13 20:33:13 -0700
committerDan Nicholson <dbn.lists@gmail.com>2012-08-13 20:40:27 -0700
commit40dc57fb41205c80f5ab69023669efb31edf840d (patch)
tree5eae604f380dfb75b872913f354e99ef6c9d3924
parent234da3983b46515fb3b7e2af6927ef1624b1f0ca (diff)
glib: Don't install m4 macros
Freedesktop #52031
-rw-r--r--glib-patches/no-installed-files.patch10
-rw-r--r--glib/m4macros/Makefile.am2
2 files changed, 11 insertions, 1 deletions
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)