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/atk/atk.mk | |
| parent | 4ac03cc86a989c2f86b2cdb7041b854bf9609049 (diff) | |
| download | buildroot-novena-732d94d25fd10fff65a378b03c3fca9bde403e95.tar.gz buildroot-novena-732d94d25fd10fff65a378b03c3fca9bde403e95.zip | |
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/atk/atk.mk')
| -rw-r--r-- | package/atk/atk.mk | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/package/atk/atk.mk b/package/atk/atk.mk index a3147f8c8..06eba8dab 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -30,7 +30,6 @@ $(ATK_DIR)/.unpacked: $(DL_DIR)/$(ATK_SOURCE) $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked (cd $(ATK_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - PKG_CONFIG=$(STAGING_DIR)/usr/bin/pkg-config \ ac_cv_c_bigendian=$(ATK_BE) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ @@ -90,18 +89,19 @@ $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ ./configure \ + --target=$(GNU_TARGET_NAME) \ --host=$(REAL_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 \ @@ -120,21 +120,8 @@ $(ATK_DIR)/atk/.libs/$(ATK_BINARY): $(ATK_DIR)/.configured touch -c $(ATK_DIR)/atk/.libs/$(ATK_BINARY) $(STAGING_DIR)/lib/$(ATK_BINARY): $(ATK_DIR)/atk/.libs/$(ATK_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 $(ATK_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ATK_DIR) install + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libatk-1.0.la touch -c $(STAGING_DIR)/lib/$(ATK_BINARY) $(TARGET_DIR)/lib/libatk-1.0.so.0: $(STAGING_DIR)/lib/$(ATK_BINARY) @@ -143,7 +130,7 @@ $(TARGET_DIR)/lib/libatk-1.0.so.0: $(STAGING_DIR)/lib/$(ATK_BINARY) $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libatk-1.0.so.0.* touch -c $(TARGET_DIR)/lib/libatk-1.0.so.0 -atk: libglib2 $(TARGET_DIR)/lib/libatk-1.0.so.0 +atk: libglib2 pkgconfig $(TARGET_DIR)/lib/libatk-1.0.so.0 atk-clean: rm -f $(TARGET_DIR)/lib/$(ATK_BINARY) |