From 9ed4a97267bddd5f3e92fbb0dba4e4fd8b1c0060 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 08 Jan 2021 00:30:38 -0500 Subject: Install libraries and executables under / not /usr BusyBox installs its versions of these executables under /, which really makes more sense, for example in case /usr is on a different and corrupted file system (/usr can't be checked if fsck is on /usr). --- (limited to 'build') diff --git a/build b/build index d7dc8dd..d2e1419 100755 --- a/build +++ b/build @@ -7,6 +7,10 @@ nop: build: oh-autoconfigure -- \ + --prefix=/ \ + --includedir=/usr/include \ + --datarootdir=/usr/share \ + --mandir=/usr/share/man \ --enable-symlink-install \ --enable-verbose-makecmds \ --enable-elf-shlibs \ @@ -22,11 +26,16 @@ build: install: build oh-autoinstall - rm dest/usr/lib/$(OPK_HOST_ARCH)/*.a + rm dest/lib/$(OPK_HOST_ARCH)/*.a + # Put pkgconfig under /usr where it belongs: + mkdir -p dest/usr/lib/$(OPK_HOST_ARCH)/ + mv \ + dest/lib/$(OPK_HOST_ARCH)/pkgconfig/ \ + dest/usr/lib/$(OPK_HOST_ARCH)/ # Bash scripts and their configuration: rm dest/etc/e2scrub.conf - rm dest/usr/sbin/e2scrub - rm dest/usr/sbin/e2scrub_all + rm dest/sbin/e2scrub + rm dest/sbin/e2scrub_all oh-fixperms oh-strip oh-installfiles -- cgit v0.9.1