diff --git a/modules/libusb b/modules/libusb index a6d00eae..f9209c46 100644 --- a/modules/libusb +++ b/modules/libusb @@ -10,13 +10,14 @@ libusb_hash := 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b libusb_configure := ./configure \ CC="$(heads_cc)" \ --host i386-elf-linux \ - --prefix "$(INSTALL)" \ + --prefix "/" \ --disable-udev \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location libusb_target := $(MAKE_JOBS) \ + DESTDIR="$(INSTALL)" \ install \ libusb_libraries := libusb/.libs/libusb-1.0.so.0 diff --git a/modules/libusb-compat b/modules/libusb-compat index fe859cf0..e3d960b2 100644 --- a/modules/libusb-compat +++ b/modules/libusb-compat @@ -12,15 +12,16 @@ libusb-compat_hash := 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea32 libusb-compat_configure := ./configure \ CC="$(heads_cc)" \ --host i386-elf-linux \ - --prefix "$(INSTALL)" \ + --prefix "/" \ PKG_CONFIG=/bin/false \ LIBUSB_1_0_CFLAGS="-I$(INSTALL)/include/libusb-1.0" \ - LIBUSB_1_0_LIBS="-L$(INSTALL)/lib -lusb-1.0" \ + LIBUSB_1_0_LIBS="$(INSTALL)/libusb-1.0.so" \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries # into our actual target location libusb-compat_target := $(MAKE_JOBS) \ + DESTDIR="$(INSTALL)" \ install \ libusb-compat_libraries := libusb/.libs/libusb-0.1.so.4 diff --git a/modules/lvm2 b/modules/lvm2 index d8f06d89..b460a0bd 100644 --- a/modules/lvm2 +++ b/modules/lvm2 @@ -14,7 +14,7 @@ lvm2_configure := \ ac_cv_func_realloc_0_nonnull=yes \ ./configure \ --host i386-elf-linux \ - --prefix $(INSTALL) \ + --prefix "/" \ --disable-selinux \ --disable-udev-systemd-background-jobs \ --disable-realtime \ @@ -27,7 +27,12 @@ lvm2_configure := \ # not sure why LIB_SUFFIX is not defined in the cross build lvm2_target := \ $(MAKE_JOBS) \ - all install_device-mapper \ + all \ + && \ + $(MAKE) \ + -C $(build)/$(lvm2_dir) \ + DESTDIR="$(INSTALL)" \ + install_device-mapper \ lvm2_libraries := libdm/libdevmapper.so.1.02 diff --git a/modules/pciutils b/modules/pciutils index 96ea3ac1..830927b8 100644 --- a/modules/pciutils +++ b/modules/pciutils @@ -22,8 +22,8 @@ pciutils_target := \ ZLIB=no \ HWDB=no \ SHARED=yes \ - IDSDIR=/ \ - PREFIX=$(INSTALL) \ + IDSDIR="/" \ + PREFIX="/" \ && \ $(MAKE) \ -C $(build)/$(pciutils_dir) \ @@ -31,7 +31,8 @@ pciutils_target := \ ZLIB=no \ HWDB=no \ SHARED=yes \ - PREFIX=$(INSTALL) \ + PREFIX="/" \ + DESTDIR="$(INSTALL)" \ install \ install-lib \