From 732d94d25fd10fff65a378b03c3fca9bde403e95 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sun, 14 Jan 2007 03:52:21 +0000 Subject: 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 --- package/libraw1394/libraw1394.mk | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'package/libraw1394') diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index 5eaf80d65..bc9620490 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -18,13 +18,24 @@ $(LIBRAW1394_DIR)/.source: $(DL_DIR)/$(LIBRAW1394_SOURCE) $(LIBRAW1394_DIR)/.configured: $(LIBRAW1394_DIR)/.source (cd $(LIBRAW1394_DIR); \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ + $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=$(STAGING_DIR) \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --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 $(LIBRAW1394_DIR)/.configured; @@ -33,7 +44,7 @@ $(LIBRAW1394_DIR)/.compiled: $(LIBRAW1394_DIR)/.configured touch $(LIBRAW1394_DIR)/.compiled $(STAGING_DIR)/lib/libraw1394.so: $(LIBRAW1394_DIR)/.compiled - make -C $(LIBRAW1394_DIR)/src install + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBRAW1394_DIR)/src install $(TARGET_DIR)/usr/lib/libraw1394.so: $(STAGING_DIR)/lib/libraw1394.so cp -dpf $(STAGING_DIR)/lib/libraw1394.so* $(TARGET_DIR)/usr/lib/ -- cgit v1.2.3