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
This commit is contained in:
Eric Andersen
2007-01-14 03:52:21 +00:00
parent 4ac03cc86a
commit 732d94d25f
103 changed files with 1688 additions and 327 deletions

View File

@@ -27,7 +27,18 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR) \
--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 \
);
touch $(LIBCGICC_DIR)/.configured
@@ -36,7 +47,7 @@ $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
touch $(LIBCGICC_DIR)/.compiled
$(STAGING_DIR)/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
$(MAKE) -C $(LIBCGICC_DIR) install
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
touch -c $(STAGING_DIR)/lib/libcgicc.so
$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/lib/libcgicc.so