From f1fb79db000ec7ce393c731a4fbdca99a006aa45 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 4 Apr 2015 14:22:06 +0200 Subject: fixed target/$LIBDIR for target/lib in root image (architecture dependend library files) --- Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e73f9fc..ea0d2ed 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,9 @@ LUA_VERSION=5.1.4 PARALLEL=-j12 +# TODO: make it a build option depending on the target +# architecture we want to build +#LIBDIR=lib LIBDIR=lib64 all: qemu vdi vmdk zip-vdi zip-vmdk @@ -163,15 +166,15 @@ busybox: cp busybox-config busybox-$(BUSYBOX_VERSION)/.config cd busybox-$(BUSYBOX_VERSION) && make $(PARALLEL) cd busybox-$(BUSYBOX_VERSION) && make install - cp /$(LIBDIR)/libcrypt.so.1 target/lib - cp /$(LIBDIR)/ld-linux-x86-64.so.2 target/lib - cp /$(LIBDIR)/libm.so.6 target/lib - cp /$(LIBDIR)/libc.so.6 target/lib - cp /$(LIBDIR)/libdl.so.2 target/lib - cp /$(LIBDIR)/libpthread.so.0 target/lib - -cp /$(LIBDIR)/libpcre.so.0 target/lib + cp /$(LIBDIR)/libcrypt.so.1 target/$(LIBDIR) + cp /$(LIBDIR)/ld-linux-x86-64.so.2 target/$(LIBDIR) + cp /$(LIBDIR)/libm.so.6 target/$(LIBDIR) + cp /$(LIBDIR)/libc.so.6 target/$(LIBDIR) + cp /$(LIBDIR)/libdl.so.2 target/$(LIBDIR) + cp /$(LIBDIR)/libpthread.so.0 target/$(LIBDIR) + -cp /$(LIBDIR)/libpcre.so.0 target/$(LIBDIR) #??? -# -cp /usr/$(LIBDIR)/libpcre.so.3 target/lib +# -cp /usr/$(LIBDIR)/libpcre.so.3 target/$(LIBDIR) busybox-clean: -- cgit v1.2.3-54-g00ecf