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/util-linux | |
| 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/util-linux')
| -rw-r--r-- | package/util-linux/util-linux.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 45774f148..a7fd1bcb6 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,8 +8,8 @@ UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VER).tar.bz2 UTIL-LINUX_SITE:=http://www.kernel.org/pub/linux/utils/util-linux UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VER) UTIL-LINUX_CAT:=$(BZCAT) -UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/mcookie -UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/mcookie +UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe +UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe $(DL_DIR)/$(UTIL-LINUX_SOURCE): $(WGET) -P $(DL_DIR) $(UTIL-LINUX_SITE)/$(UTIL-LINUX_SOURCE) @@ -32,6 +32,7 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked --exec-prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ + --libdir=/lib \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ |