Fixed base build files to put non-elf stuff in /usr

base/jansson/jansson.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --enable-shared \
     --disable-static 
 

base/jbig2dec/jbig2dec.SMBuild

@@ -17,7 +17,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
+    --bindir=/bin \
     --disable-static \
     --enable-shared 
 

base/json-c/json-c.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --enable-shared \
     --disable-static 
 

base/json-glib/json-glib.SMBuild

@@ -17,7 +17,8 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix=/ \
+  meson .. --prefix=/usr \
+     --bindir=/bin \
      -Dintrospection=false
 
   ninja

base/kernel-headers/kernel-headers.SMBuild

@@ -19,8 +19,8 @@ prepbuilddir() {
 }
 
 build() {
-  make ARCH="$arch" prefix= DESTDIR=$pkg install
+  make ARCH="$arch" prefix=/usr DESTDIR=$pkg install
-  cp -r generic/include $pkg/
+  cp -r generic/include $pkg/usr/
 
   mkfinalpkg
 }

base/kmod/kmod.SMBuild

@@ -20,9 +20,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
-    --bindir=/bin \
+    --bindir=/bin
-    --libdir=/lib 
 
   make
   make install DESTDIR=$pkg

base/lame/lame.SMBuild

@@ -19,7 +19,8 @@ prepbuilddir() {
 build() {
   LIBS="-lcurses -lterminfo" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
+    --bindir=/bin \
     --enable-shared \
     --enable-nasm \
     --disable-static

base/less/less.SMBuild

@@ -22,7 +22,8 @@ prepbuilddir() {
 build() {
   LDFLAGS="-static" \
   ./configure \
-    --prefix=
+    --prefix=/usr \
+    --bindir=/bin
 
   make
   make install DESTDIR=$pkg

base/libaio/libaio.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   make
-  make prefix="$pkg" libdir=$pkg/lib install
+  make prefix="$pkg" includedir="$pkg/usr/include" libdir="$pkg/usr/lib" install
 
   cp COPYING $pkgdocs/
 

base/libao/libao.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --enable-shared \
     --disable-static \
     --disable-pulse

base/libasr/libasr.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
     --disable-static 
 
   make