diff options
| author | Eric Andersen <andersen@codepoet.org> | 2007-01-14 03:52:21 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2007-01-14 03:52:21 +0000 |
| commit | 732d94d25fd10fff65a378b03c3fca9bde403e95 (patch) | |
| tree | b9a58d5d379614371b65b671fb7851622a6b5667 /package/libglib2/libglib2.mk | |
| parent | 4ac03cc86a989c2f86b2cdb7041b854bf9609049 (diff) | |
fixup a whole steaming pile of insanity. When packages are configured,
they should be configured with --prefix=/usr and we then need to use
make DESTDIR=$(STAGING_DIR) install to get things installed into the
staging directory. The current situation for many packages, which use
--prefix=$(STAGING_DIR) results in the staging_dir paths getting compiled
into the binary itself.
This also adds in a pile of libtool fixups. Between broken pkgconfig,
broken libtool handling, and broken --prefix settings, its a wonder
things have worked as well as they have up till now.
-Erik
Diffstat (limited to 'package/libglib2/libglib2.mk')
| -rw-r--r-- | package/libglib2/libglib2.mk | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d8b502cf5..abf03968e 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -90,18 +90,19 @@ $(LIBGLIB2_DIR)/.configured: $(LIBGLIB2_DIR)/.unpacked gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ ./configure \ - --host=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=$(STAGING_DIR) \ - --exec_prefix=$(STAGING_DIR) \ - --libdir=$(STAGING_DIR)/lib \ - --includedir=$(STAGING_DIR)/include \ + --prefix=/usr \ + --exec-prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ + --libdir=/lib \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ + --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ --enable-shared \ @@ -115,21 +116,11 @@ $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY): $(LIBGLIB2_DIR)/.configured touch -c $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY) $(STAGING_DIR)/lib/$(LIBGLIB2_BINARY): $(LIBGLIB2_DIR)/glib/.libs/$(LIBGLIB2_BINARY) - $(MAKE) prefix=$(STAGING_DIR) \ - exec_prefix=$(STAGING_DIR) \ - bindir=$(STAGING_DIR)/bin \ - sbindir=$(STAGING_DIR)/sbin \ - libexecdir=$(STAGING_DIR)/libexec \ - datadir=$(STAGING_DIR)/share \ - sysconfdir=$(STAGING_DIR)/etc \ - sharedstatedir=$(STAGING_DIR)/com \ - localstatedir=$(STAGING_DIR)/var \ - libdir=$(STAGING_DIR)/lib \ - includedir=$(STAGING_DIR)/include \ - oldincludedir=$(STAGING_DIR)/include \ - infodir=$(STAGING_DIR)/info \ - mandir=$(STAGING_DIR)/man \ - -C $(LIBGLIB2_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGLIB2_DIR) install; + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libglib-2.0.la + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libgmodule-2.0.la + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libgobject-2.0.la + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libgthread-2.0.la $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6: $(STAGING_DIR)/lib/$(LIBGLIB2_BINARY) cp -a $(STAGING_DIR)/lib/libglib-2.0.so $(TARGET_DIR)/lib/ |