summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2015-04-04 14:22:06 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2015-04-04 14:22:06 +0200
commitf1fb79db000ec7ce393c731a4fbdca99a006aa45 (patch)
treedef366cd97702d2b2d815cded13fbf19e3636d32 /Makefile
parenta49934a6096a140581219b7e1ca415160366dc54 (diff)
downloadminilinux-f1fb79db000ec7ce393c731a4fbdca99a006aa45.tar.gz
minilinux-f1fb79db000ec7ce393c731a4fbdca99a006aa45.tar.bz2
fixed target/$LIBDIR for target/lib in root image (architecture dependend library files)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 11 insertions, 8 deletions
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: