1 files changed, 7 insertions, 27 deletions
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index 30d6f1be8..fc0b7438c 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,31 +1,11 @@
---- glib/Makefile.in.orig	2012-09-24 01:59:13.000000000 +0000
-+++ glib/Makefile.in	2012-09-24 02:02:07.000000000 +0000
-@@ -585,7 +585,7 @@
- #
- DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
+--- glib/Makefile.in.orig	2013-09-26 18:18:49.000000000 +0200
++++ glib/Makefile.in	2013-09-26 18:19:38.000000000 +0200
+@@ -961,7 +961,7 @@
+ @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
+ 
+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
 -configexecincludedir = $(libdir)/glib-2.0/include
-+configexecincludedir = $(includedir)/glib-2.0
++configexecincludedir = $(prefix)/include/glib-2.0
  nodist_configexecinclude_HEADERS = glibconfig.h
  @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
  @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1617,7 +1617,7 @@
- info-am:
- 
- install-data-am: install-data-local install-deprecatedincludeHEADERS \
--	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
-+	install-glibincludeHEADERS \
- 	install-glibsubincludeHEADERS install-tapsetDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1906,9 +1906,7 @@
- libglib-gdb.py: libglib-gdb.py.in
- 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
- 
--install-data-hook: libglib-gdb.py
--	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
--	$(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
-+install-data-hook:
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)