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/distcc | |
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/distcc')
-rw-r--r-- | package/distcc/distcc.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index d9a88e706..6dc6e5353 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -22,7 +22,7 @@ $(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked (cd $(DISTCC_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ + $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ @@ -31,6 +31,7 @@ $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked --prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ + --libdir=/lib \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ |