another attempt
This commit is contained in:
parent
8b8dd4b11c
commit
ba121059e7
|
@ -1,29 +1,18 @@
|
||||||
--- glib-2.11.1/glib-2.0.pc.in.multilib 2006-05-25 10:17:11.000000000 -0400
|
--- glib-2.11.1/Makefile.in.libdir 2006-05-25 13:40:06.000000000 -0400
|
||||||
+++ glib-2.11.1/glib-2.0.pc.in 2006-05-25 10:17:27.000000000 -0400
|
+++ glib-2.11.1/Makefile.in 2006-05-25 13:40:59.000000000 -0400
|
||||||
@@ -11,5 +11,5 @@
|
@@ -287,13 +287,13 @@
|
||||||
Description: C Utility Library
|
|
||||||
Version: @VERSION@
|
|
||||||
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
|
|
||||||
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include
|
|
||||||
+Cflags: -I${includedir}/glib-2.0 -I${prefix}/lib/glib-2.0/include
|
|
||||||
|
|
||||||
--- glib-2.11.1/Makefile.am.multilib 2006-05-25 10:16:15.000000000 -0400
|
|
||||||
+++ glib-2.11.1/Makefile.am 2006-05-25 10:17:00.000000000 -0400
|
|
||||||
@@ -49,7 +49,7 @@
|
|
||||||
config.h.win32 \
|
|
||||||
gtk-doc.make
|
gtk-doc.make
|
||||||
|
|
||||||
-configexecincludedir = $(libdir)/glib-2.0/include
|
|
||||||
+configexecincludedir = $(prefix)/lib/glib-2.0/include
|
|
||||||
#configexecinclude_DATA = glibconfig.h
|
|
||||||
|
|
||||||
install-exec-local: glibconfig.h
|
-configexecincludedir = $(libdir)/glib-2.0/include
|
||||||
@@ -71,7 +71,7 @@
|
+configexecincludedir = $(prefix)$(libdir)/glib-2.0/include
|
||||||
cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
|
|
||||||
echo timestamp > stamp-gc-h
|
CONFIGURE_DEPENDENCIES = acglib.m4
|
||||||
|
|
||||||
|
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
|
||||||
|
|
||||||
-pkgconfigdir = $(libdir)/pkgconfig
|
-pkgconfigdir = $(libdir)/pkgconfig
|
||||||
+pkgconfigdir = $(prefix)/lib/pkgconfig
|
+pkgconfigdir = $(prefix)$(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc
|
pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc
|
||||||
|
|
||||||
$(pkgconfig_DATA): config.status
|
# install mkinstalldirs for glib-gettextize's benefit
|
||||||
|
|
|
@ -44,8 +44,6 @@ version 2 of the GLib library.
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
# .libdir touches .am
|
|
||||||
automake-1.7
|
|
||||||
for i in config.guess config.sub ; do
|
for i in config.guess config.sub ; do
|
||||||
test -f /usr/share/libtool/$i && cp /usr/share/libtool/$i .
|
test -f /usr/share/libtool/$i && cp /usr/share/libtool/$i .
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue