diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/initramfs.mk | 2 | ||||
| -rw-r--r-- | package/fakeroot/fakeroot.mk | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index 1c10d0f5b..dbec0520b 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -115,7 +115,7 @@ $(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(PROJECT_BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \ ) > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) chmod +x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- \ + $(HOST_DIR)/usr/bin/fakeroot -- \ $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) touch -c $@ diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 2ebccc939..0db6628c6 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -36,8 +36,7 @@ $(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked (cd $(FAKEROOT_DIR1); rm -rf config.cache; \ CC="$(HOSTCC)" \ $(FAKEROOT_SOURCE_DIR)/configure \ - --prefix=/usr \ - $(DISABLE_NLS) \ + --prefix=$(HOST_DIR)/usr \ ) touch $@ @@ -45,16 +44,11 @@ $(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured $(MAKE) -C $(FAKEROOT_DIR1) touch -c $@ -$(STAGING_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FAKEROOT_DIR1) install - $(SED) 's,^PREFIX=.*,PREFIX=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/fakeroot - $(SED) 's,^BINDIR=.*,BINDIR=$(STAGING_DIR)/usr/bin,g' $(STAGING_DIR)/usr/bin/fakeroot - $(SED) 's,^PATHS=.*,PATHS=$(FAKEROOT_DIR1)/.libs:/lib:/usr/lib,g' $(STAGING_DIR)/usr/bin/fakeroot - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/lib/libfakeroot.la +$(HOST_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked + $(MAKE) -C $(FAKEROOT_DIR1) install touch -c $@ -host-fakeroot: uclibc $(STAGING_DIR)/usr/bin/fakeroot +host-fakeroot: uclibc $(HOST_DIR)/usr/bin/fakeroot host-fakeroot-clean: -$(MAKE) -C $(FAKEROOT_DIR1) clean |