Mercurial > mxe-octave
changeset 713:52e8cc2f008f
put the tools of package glib into usr/TARGET/bin/ instead of usr/bin/
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Mon, 08 Feb 2010 00:22:58 +0100 |
| parents | 38a787e5a126 |
| children | 29f1ba4559ae |
| files | src/glib-win32.patch src/glib.mk |
| diffstat | 2 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/glib-win32.patch Mon Feb 08 00:21:45 2010 +0100 +++ b/src/glib-win32.patch Mon Feb 08 00:22:58 2010 +0100 @@ -25,3 +25,19 @@ fi fi ]) +diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in +--- glib-2.23.2.orig/glib-2.0.pc.in 2009-04-01 01:04:20.000000000 +0200 ++++ glib-2.23.2/glib-2.0.pc.in 2010-02-07 23:58:08.000000000 +0100 +@@ -3,9 +3,9 @@ + libdir=@libdir@ + includedir=@includedir@ + +-glib_genmarshal=glib-genmarshal +-gobject_query=gobject-query +-glib_mkenums=glib-mkenums ++glib_genmarshal=@bindir@/glib-genmarshal ++gobject_query=@bindir@/gobject-query ++glib_mkenums=@bindir@/glib-mkenums + + Name: GLib + Description: C Utility Library
--- a/src/glib.mk Mon Feb 08 00:21:45 2010 +0100 +++ b/src/glib.mk Mon Feb 08 00:22:58 2010 +0100 @@ -30,7 +30,7 @@ $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1).native/configure' cd '$(1).native' && ./configure \ --disable-shared \ - --prefix='$(PREFIX)' \ + --prefix='$(PREFIX)/$(TARGET)' \ --enable-regex \ --disable-threads \ --disable-selinux \ @@ -57,7 +57,8 @@ --with-pcre=system \ --with-libiconv=gnu \ CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' $(MAKE) -C '$(1)/glib' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=