From de4e838a9e69a8520a9cd094448c8aebc62cd836 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Wed, 7 Dec 2022 12:57:43 +0000
Subject: [PATCH] libdir drop custom directory

---
 app/arch/bzip2/ympbuild        | 10 ++++------
 app/arch/libarchive/ympbuild   |  5 +----
 app/arch/lz4/ympbuild          |  5 +----
 app/arch/lzo/ympbuild          |  9 +++------
 app/arch/xz-utils/ympbuild     |  5 +----
 app/arch/zlib/ympbuild         |  7 ++-----
 app/misc/hello/ympbuild        |  4 +---
 dev/db/sqlite/ympbuild         | 11 ++++-------
 dev/libs/elfutils/ympbuild     |  5 +----
 dev/libs/expat/ympbuild        |  6 +-----
 dev/libs/glib/ympbuild         |  5 +----
 dev/libs/gmp/ympbuild          |  5 +----
 dev/libs/libmpc/ympbuild       |  4 +---
 dev/libs/libpcre2/ympbuild     |  5 +----
 dev/libs/libtasn1/ympbuild     |  5 +----
 dev/libs/libunistring/ympbuild |  8 +++-----
 dev/libs/libxml2/ympbuild      |  5 +----
 dev/libs/mpfr/ympbuild         |  5 +----
 dev/libs/nettle/ympbuild       |  5 +----
 dev/libs/openssl/ympbuild      |  5 +----
 dev/util/pkgconf/ympbuild      |  5 +----
 net/dns/libidn2/ympbuild       |  5 +----
 net/libs/gnutls/ympbuild       |  5 +----
 net/libs/libnghttp2/ympbuild   |  5 +----
 net/libs/libnsl/ympbuild       |  5 +----
 net/libs/libpsl/ympbuild       |  5 +----
 net/libs/libseccomp/ympbuild   |  5 +----
 net/libs/libssh/ympbuild       |  7 ++-----
 net/libs/libtirpc/ympbuild     |  5 +----
 net/misc/curl/ympbuild         | 17 +++++++----------
 sys/apps/acl/ympbuild          |  6 +-----
 sys/apps/attr/ympbuild         |  5 +----
 sys/apps/file/ympbuild         | 11 ++++-------
 sys/apps/shadow/ympbuild       |  4 +---
 sys/apps/util-linux/ympbuild   |  5 +----
 sys/apps/ymp/ympbuild          |  4 +---
 sys/devel/binutils/ympbuild    |  4 +---
 sys/devel/gettext/ympbuild     |  4 +---
 sys/devel/libtool/ympbuild     |  4 +---
 sys/libs/gdbm/ympbuild         |  4 +---
 sys/libs/libcap-ng/ympbuild    |  5 +----
 sys/libs/libcap/ympbuild       |  5 +----
 sys/libs/libxcrypt/ympbuild    |  7 ++-----
 sys/libs/ncurses/ympbuild      |  8 ++------
 sys/libs/readline/ympbuild     |  6 ++----
 sys/process/audit/ympbuild     |  5 +----
 46 files changed, 70 insertions(+), 200 deletions(-)

diff --git a/app/arch/bzip2/ympbuild b/app/arch/bzip2/ympbuild
index d7258894..09e50e1f 100644
--- a/app/arch/bzip2/ympbuild
+++ b/app/arch/bzip2/ympbuild
@@ -34,11 +34,11 @@ package(){
     ln -sf bzip2 "${DESTDIR}"/usr/bin/bunzip2
     ln -sf bzip2 "${DESTDIR}"/usr/bin/bzcat
 
-    install -m755 libbz2.a "${DESTDIR}"/usr/lib64/bzip2/
+    install -m755 libbz2.a "${DESTDIR}"/usr/lib64
     install -m755 $name-shared/libbz2.so.${version} "${DESTDIR}"/usr/lib64/bzip2
-    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/bzip2/libbz2.so
-    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/bzip2/libbz2.so.1
-    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/bzip2/libbz2.so.1.0
+    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64libbz2.so
+    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64libbz2.so.1
+    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64libbz2.so.1.0
 
     install -m644 bzlib.h "${DESTDIR}"/usr/include/
 
@@ -46,6 +46,4 @@ package(){
     ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bunzip2.1
     ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzcat.1
     ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzip2recover.1
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/bzip2/" > ${DESTDIR}/etc/ld.so.conf.d/bzip2.conf
 }
diff --git a/app/arch/libarchive/ympbuild b/app/arch/libarchive/ympbuild
index 0ed70407..aec0c1b9 100644
--- a/app/arch/libarchive/ympbuild
+++ b/app/arch/libarchive/ympbuild
@@ -28,7 +28,7 @@ cd $name-$version
 
 setup() {
     ./configure --prefix=/usr \
-	--libdir=/usr/lib64/libarchive \
+	--libdir=/usr/lib64 \
 	--enable-static \
 	--enable-shared \
 	--enable-xattr \
@@ -49,7 +49,4 @@ build() {
 }
 package() {
     make -j$(nproc) install
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libarchive/" > ${DESTDIR}/etc/ld.so.conf.d/libarchive.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/app/arch/lz4/ympbuild b/app/arch/lz4/ympbuild
index 21ee4d7f..7d08b264 100644
--- a/app/arch/lz4/ympbuild
+++ b/app/arch/lz4/ympbuild
@@ -23,9 +23,6 @@ build(){
 package(){
     make install -j`nproc` PREFIX=/usr
     mkdir -p ${DESTDIR}/usr/lib64
-    mv ${DESTDIR}/usr/{lib,lib64/lz4}
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/lz4/" > ${DESTDIR}/etc/ld.so.conf.d/lz4.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
+    mv ${DESTDIR}/usr/{lib,lib64}
 }
 
diff --git a/app/arch/lzo/ympbuild b/app/arch/lzo/ympbuild
index 7e934d9b..a71813f8 100644
--- a/app/arch/lzo/ympbuild
+++ b/app/arch/lzo/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/lzo
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -29,11 +29,8 @@ build(){
 
 package(){
     make install -j`nproc`
-    install -m 755 libminilzo.so.0 "${DESTDIR}"/usr/lib64/lzo
+    install -m 755 libminilzo.so.0 "${DESTDIR}"/usr/lib64
     install -p -m 644 minilzo/minilzo.h ${DESTDIR}/usr/include/lzo
-    ln -s libminilzo.so.0 "${DESTDIR}"/usr/lib64/lzo/libminilzo.so
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/lzo/" > ${DESTDIR}/etc/ld.so.conf.d/lzo.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
+    ln -s libminilzo.so.0 "${DESTDIR}"/usr/lib64/libminilzo.so
 }
 
diff --git a/app/arch/xz-utils/ympbuild b/app/arch/xz-utils/ympbuild
index 8f5ae569..8eed918e 100644
--- a/app/arch/xz-utils/ympbuild
+++ b/app/arch/xz-utils/ympbuild
@@ -17,7 +17,7 @@ cd xz-$version
 
 setup(){
     ./configure --prefix=/usr \
-	--libdir=/usr/lib64/xz-utils \
+	--libdir=/usr/lib64 \
 	--enable-static \
 	--enable-shared \
 	$(use_opt doc --enable-doc --disable-doc) \
@@ -28,7 +28,4 @@ build(){
 }
 package(){
     make install -j$(nproc)
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/xz-utils/" > ${DESTDIR}/etc/ld.so.conf.d/xz-utils.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/app/arch/zlib/ympbuild b/app/arch/zlib/ympbuild
index 71427d63..6e84f214 100644
--- a/app/arch/zlib/ympbuild
+++ b/app/arch/zlib/ympbuild
@@ -15,10 +15,10 @@ group=(app.arch)
 cd $name-$version
 
 setup(){
-    ./configure --prefix=/usr --libdir=/lib64/zlib --shared
+    ./configure --prefix=/usr --libdir=/lib64 --shared
     cd contrib/minizip
     autoreconf -fvi
-	./configure --prefix=/usr --libdir=/lib64/zlib
+	./configure --prefix=/usr --libdir=/lib64
 }
 build(){
     make -j$(nproc)
@@ -29,7 +29,4 @@ package(){
     make install pkgconfigdir="/usr/lib64/pkgconfig"
     cd contrib/minizip
     make install pkgconfigdir="/usr/lib64/pkgconfig"
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/lib64/zlib/" > ${DESTDIR}/etc/ld.so.conf.d/zlib.conf
-
 }
diff --git a/app/misc/hello/ympbuild b/app/misc/hello/ympbuild
index 31fcf240..1f6713a6 100644
--- a/app/misc/hello/ympbuild
+++ b/app/misc/hello/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/hello
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -28,6 +28,4 @@ build(){
 
 package(){
     make install
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/hello/" > ${DESTDIR}/etc/ld.so.conf.d/hello.conf
 }
diff --git a/dev/db/sqlite/ympbuild b/dev/db/sqlite/ympbuild
index 3423581d..609ba696 100644
--- a/dev/db/sqlite/ympbuild
+++ b/dev/db/sqlite/ympbuild
@@ -20,11 +20,11 @@ cd $name-autoconf-$srcver
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/sqlite \
+        --libdir=/usr/lib64 \
         --enable-fts3 \
-	--enable-fts4 \
-	--enable-fts5 \
-	--enable-rtree \
+        --enable-fts4 \
+        --enable-fts5 \
+        --enable-rtree \
         CPPFLAGS="-DSQLITE_ENABLE_FTS3=1            \
                   -DSQLITE_ENABLE_FTS4=1            \
                   -DSQLITE_ENABLE_COLUMN_METADATA=1 \
@@ -40,8 +40,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/sqlite/" > ${DESTDIR}/etc/ld.so.conf.d/sqlite.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/elfutils/ympbuild b/dev/libs/elfutils/ympbuild
index 17d78e89..5d1457fd 100644
--- a/dev/libs/elfutils/ympbuild
+++ b/dev/libs/elfutils/ympbuild
@@ -23,7 +23,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/elfutils \
+        --libdir=/usr/lib64 \
 		--enable-shared \
 		--enable-static \
 		--disable-debuginfod \
@@ -43,8 +43,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/elfutils/" > ${DESTDIR}/etc/ld.so.conf.d/elfutils.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/expat/ympbuild b/dev/libs/expat/ympbuild
index 668e8746..c84233d3 100644
--- a/dev/libs/expat/ympbuild
+++ b/dev/libs/expat/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib64/expat \
+        -DCMAKE_INSTALL_LIBDIR=lib64 \
         -DCMAKE_BUILD_TYPE=None \
         -DEXPAT_BUILD_DOCS=false \
         -W no-dev \
@@ -32,9 +32,5 @@ build(){
 
 package(){
     make install -C build
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/expat/" > ${DESTDIR}/etc/ld.so.conf.d/expat.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
-    mv ${DESTDIR}/usr/lib64/{$name/cmake,}
 }
 
diff --git a/dev/libs/glib/ympbuild b/dev/libs/glib/ympbuild
index dfafc4f6..f7e7102d 100644
--- a/dev/libs/glib/ympbuild
+++ b/dev/libs/glib/ympbuild
@@ -20,7 +20,7 @@ cd $name-$version
 
 setup(){
     meson setup build --prefix=/usr \
-        --libdir=/usr/lib64/glib2.0 \
+        --libdir=/usr/lib64 \
         --default-library both \
         -D glib_debug=disabled \
         -D selinux=disabled \
@@ -35,8 +35,5 @@ package(){
     ninja -C build install
     mkdir -p ${DESTDIR}/etc/sysconf.d/
     install ../glib.sysconf ${DESTDIR}/etc/sysconf.d/glib
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/glib2.0/" > ${DESTDIR}/etc/ld.so.conf.d/glib.conf
-    mv ${DESTDIR}/usr/lib64/{glib2.0/pkgconfig,}
 }
 
diff --git a/dev/libs/gmp/ympbuild b/dev/libs/gmp/ympbuild
index fcdcbf1d..f24220d8 100644
--- a/dev/libs/gmp/ympbuild
+++ b/dev/libs/gmp/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-	--libdir=/usr/lib64/gmp \
+	--libdir=/usr/lib64 \
 	$(use_opt cxx --enable-cxx --disable-cxx)
 }
 
@@ -28,8 +28,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/gmp/" > ${DESTDIR}/etc/ld.so.conf.d/gmp.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/libmpc/ympbuild b/dev/libs/libmpc/ympbuild
index 7fc5df9e..d7a8e64d 100644
--- a/dev/libs/libmpc/ympbuild
+++ b/dev/libs/libmpc/ympbuild
@@ -18,7 +18,7 @@ cd mpc-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libmpc
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -27,7 +27,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libmpc/" > ${DESTDIR}/etc/ld.so.conf.d/libmpc.conf
 }
 
diff --git a/dev/libs/libpcre2/ympbuild b/dev/libs/libpcre2/ympbuild
index 736c42f9..d8e017ca 100644
--- a/dev/libs/libpcre2/ympbuild
+++ b/dev/libs/libpcre2/ympbuild
@@ -19,7 +19,7 @@ cd pcre2-$version
 
 setup(){
     ./configure --prefix=/usr \
-    	--libdir=/usr/lib64/libpcre2 \
+    	--libdir=/usr/lib64 \
 	--enable-shared \
 	--enable-static \
 	$(use_opt zlib --enable-pcre2grep-libz --disable-pcre2grep-libz) \
@@ -32,8 +32,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libpcre2/" > ${DESTDIR}/etc/ld.so.conf.d/libpcre2.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/libtasn1/ympbuild b/dev/libs/libtasn1/ympbuild
index 80ce98ef..454e5f5e 100644
--- a/dev/libs/libtasn1/ympbuild
+++ b/dev/libs/libtasn1/ympbuild
@@ -16,14 +16,11 @@ cd "libtasn1-$version"
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libtasn1
+        --libdir=/usr/lib64
 }
 build(){
     make -j`nproc`
 }
 package(){
     make -j`nproc` install
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libtasn1/" > ${DESTDIR}/etc/ld.so.conf.d/libtasn1.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/dev/libs/libunistring/ympbuild b/dev/libs/libunistring/ympbuild
index 9d9de8dd..33dd339d 100644
--- a/dev/libs/libunistring/ympbuild
+++ b/dev/libs/libunistring/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libunistring/
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -27,9 +27,7 @@ build(){
 
 package(){
     make install -j`nproc`
-    ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring/libunistring.so.2
-    ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring/libunistring.so.2.2.0
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libunistring/" > ${DESTDIR}/etc/ld.so.conf.d/libunistring.conf
+    ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring.so.2
+    ln -s libunistring.so ${DESTDIR}/usr/lib64/libunistring.so.2.2.0
 }
 
diff --git a/dev/libs/libxml2/ympbuild b/dev/libs/libxml2/ympbuild
index 6ae3b742..feb33730 100644
--- a/dev/libs/libxml2/ympbuild
+++ b/dev/libs/libxml2/ympbuild
@@ -24,7 +24,7 @@ setup(){
     ./autogen.sh
     ./configure --prefix=/usr \
     --with-history \
-    --libdir=/usr/lib64/libxml2 \
+    --libdir=/usr/lib64 \
     $(use_opt python --with-python --without-python)
 }
 
@@ -38,8 +38,5 @@ package(){
         mv ${DESTDIR}/usr/lib/* ${DESTDIR}/usr/lib64/
         rmdir ${DESTDIR}/usr/lib/
     fi
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libxml2/" > ${DESTDIR}/etc/ld.so.conf.d/libxml2.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/mpfr/ympbuild b/dev/libs/mpfr/ympbuild
index bba05583..2ce7ccf7 100644
--- a/dev/libs/mpfr/ympbuild
+++ b/dev/libs/mpfr/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-	--libdir=/usr/lib64/mpfr \
+	--libdir=/usr/lib64 \
 	--enable-shared \
 	--enable-static \
 	--disable-maintainer-mode \
@@ -31,7 +31,4 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/mpfr/" > ${DESTDIR}/etc/ld.so.conf.d/mpfr.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/dev/libs/nettle/ympbuild b/dev/libs/nettle/ympbuild
index 543106b6..42c46ea5 100644
--- a/dev/libs/nettle/ympbuild
+++ b/dev/libs/nettle/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/nettle
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -27,8 +27,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/nettle/" > ${DESTDIR}/etc/ld.so.conf.d/nettle.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/openssl/ympbuild b/dev/libs/openssl/ympbuild
index 1fd724f2..7e4a63f7 100644
--- a/dev/libs/openssl/ympbuild
+++ b/dev/libs/openssl/ympbuild
@@ -23,7 +23,7 @@ cd $name-$version
 setup(){
     ./Configure --prefix=/usr \
         --openssldir=/etc/ssl \
-        --libdir=lib64/openssl \
+        --libdir=lib64 \
         shared linux-x86_64
 }
 
@@ -40,8 +40,5 @@ package(){
     install_sw \
     install_ssldirs \
     install_man_docs  -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/openssl/" > ${DESTDIR}/etc/ld.so.conf.d/openssl.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/util/pkgconf/ympbuild b/dev/util/pkgconf/ympbuild
index b53f3b2f..f7442652 100644
--- a/dev/util/pkgconf/ympbuild
+++ b/dev/util/pkgconf/ympbuild
@@ -24,7 +24,7 @@ cd $name-$name-$version
 setup(){
     sh ./autogen.sh
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/pkgconf \
+        --libdir=/usr/lib64 \
         --with-pkg-config-dir=/usr/share/pkgconfig:/usr/lib64/pkgconfig:/lib64/pkgconfig
 }
 
@@ -38,8 +38,5 @@ package(){
     install -Dt "${DESTDIR}/usr/share/pkgconfig/personality.d" -m644 \
     ../i686-pc-linux-gnu.personality \
     ../x86_64-pc-linux-gnu.personality
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/pkgconf/" > ${DESTDIR}/etc/ld.so.conf.d/pkgconf.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/dns/libidn2/ympbuild b/net/dns/libidn2/ympbuild
index 3bcbe4da..d43d7775 100644
--- a/net/dns/libidn2/ympbuild
+++ b/net/dns/libidn2/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libidn2
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -27,8 +27,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libidn2/" > ${DESTDIR}/etc/ld.so.conf.d/libidn2.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/gnutls/ympbuild b/net/libs/gnutls/ympbuild
index 8a00f816..1a443839 100644
--- a/net/libs/gnutls/ympbuild
+++ b/net/libs/gnutls/ympbuild
@@ -24,7 +24,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-    --libdir=/usr/lib64/gnutls \
+    --libdir=/usr/lib64 \
     --disable-guile \
     --enable-ssl3-support \
     --enable-openssl-compatibility \
@@ -41,8 +41,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/gnutls/" > ${DESTDIR}/etc/ld.so.conf.d/gnutls.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libnghttp2/ympbuild b/net/libs/libnghttp2/ympbuild
index edf5c6e4..b1178558 100644
--- a/net/libs/libnghttp2/ympbuild
+++ b/net/libs/libnghttp2/ympbuild
@@ -20,7 +20,7 @@ cd nghttp2-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libnghttp2 \
+        --libdir=/usr/lib64 \
         --without-neverbleed \
         --without-jemalloc \
         --disable-examples \
@@ -35,8 +35,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libnghttp2/" > ${DESTDIR}/etc/ld.so.conf.d/libnghttp2.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libnsl/ympbuild b/net/libs/libnsl/ympbuild
index 975e9d8d..76a728e6 100644
--- a/net/libs/libnsl/ympbuild
+++ b/net/libs/libnsl/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libnsl
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -28,8 +28,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libnsl/" > ${DESTDIR}/etc/ld.so.conf.d/libnsl.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libpsl/ympbuild b/net/libs/libpsl/ympbuild
index 9cce83d2..86ae6b5e 100644
--- a/net/libs/libpsl/ympbuild
+++ b/net/libs/libpsl/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libpsl
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -27,8 +27,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libpsl/" > ${DESTDIR}/etc/ld.so.conf.d/libpsl.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libseccomp/ympbuild b/net/libs/libseccomp/ympbuild
index a1d8f610..58a05a5c 100644
--- a/net/libs/libseccomp/ympbuild
+++ b/net/libs/libseccomp/ympbuild
@@ -15,7 +15,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-	--libdir=/usr/lib64/libseccomp \
+	--libdir=/usr/lib64 \
 	--enable-static \
 	--enable-shared \
 	--disable-silent-rules \
@@ -27,7 +27,4 @@ build(){
 }
 package(){
     make install -j$(nproc)
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libseccomp/" > ${DESTDIR}/etc/ld.so.conf.d/libseccomp.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/net/libs/libssh/ympbuild b/net/libs/libssh/ympbuild
index a9655f32..9ff0bf80 100644
--- a/net/libs/libssh/ympbuild
+++ b/net/libs/libssh/ympbuild
@@ -19,7 +19,7 @@ zlib_depends=(zlib)
 setup() {
     cmake -S $name-$version -B build \
 	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_INSTALL_LIBDIR=/usr/lib64/libssh \
+	-DCMAKE_INSTALL_LIBDIR=/usr/lib64 \
 	-DWITH_EXAMPLES=NO \
 	-DBUILD_SHARED_LIBS=YES \
 	-DBUILD_STATIC_LIB=YES \
@@ -37,8 +37,5 @@ build() {
 }
 package() {
     make -C build install
-    install build/src/libssh.a ${DESTDIR}/usr/lib64/libssh/
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libssh/" > ${DESTDIR}/etc/ld.so.conf.d/libssh.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
+    install build/src/libssh.a ${DESTDIR}/usr/lib64/
 }
diff --git a/net/libs/libtirpc/ympbuild b/net/libs/libtirpc/ympbuild
index 6360eb54..d8c0594c 100644
--- a/net/libs/libtirpc/ympbuild
+++ b/net/libs/libtirpc/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libtirpc \
+        --libdir=/usr/lib64 \
         --disable-gssapi
 }
 
@@ -29,8 +29,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libtirpc/" > ${DESTDIR}/etc/ld.so.conf.d/libtirpc.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/misc/curl/ympbuild b/net/misc/curl/ympbuild
index e3dc3d53..474e5d15 100644
--- a/net/misc/curl/ympbuild
+++ b/net/misc/curl/ympbuild
@@ -36,7 +36,7 @@ prepare(){
 setup(){
     opts=(
         --prefix=/usr
-        --libdir=/usr/lib64/curl
+        --libdir=/usr/lib64
         --disable-ldap
         --disable-ldaps
         --disable-versioned-symbols
@@ -72,22 +72,19 @@ package(){
     if use gnutls ; then
         cd ../curl-gnutls
         make install -j`nproc`
-        mv "${DESTDIR}"/usr/lib64/curl/libcurl{,-gnutls}.so.4.8.0
-        mv "${DESTDIR}"/usr/lib64/curl/libcurl{,-gnutls}.a
-        mv "${DESTDIR}"/usr/lib64/curl/pkgconfig/libcurl{,-gnutls}.pc
+        mv "${DESTDIR}"/usr/lib64/libcurl{,-gnutls}.so.4.8.0
+        mv "${DESTDIR}"/usr/lib64/libcurl{,-gnutls}.a
+        mv "${DESTDIR}"/usr/lib64/pkgconfig/libcurl{,-gnutls}.pc
         sed -i "s/-lcurl/-lcurl-gnutls/g" "${DESTDIR}"/usr/lib64/pkgconfig/libcurl-gnutls.pc
-        ln -s libcurl-gnutls.so.4 "${DESTDIR}"/usr/lib64/curl/libcurl-gnutls.so
+        ln -s libcurl-gnutls.so.4 "${DESTDIR}"/usr/lib64/libcurl-gnutls.so
         for ver in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
-            ln -s libcurl-gnutls.so.4.8.0 "${DESTDIR}"/usr/lib64/curl/libcurl-gnutls.so.${ver}
+            ln -s libcurl-gnutls.so.4.8.0 "${DESTDIR}"/usr/lib64/libcurl-gnutls.so.${ver}
         done
     fi
     cd ../$name-$version
     make install -j`nproc`
     for ver in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
-        ln -s libcurl.so.4.8.0 "${DESTDIR}"/usr/lib64/curl/libcurl.so.${ver}
+        ln -s libcurl.so.4.8.0 "${DESTDIR}"/usr/lib64/libcurl.so.${ver}
     done
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/curl/" > ${DESTDIR}/etc/ld.so.conf.d/curl.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/apps/acl/ympbuild b/sys/apps/acl/ympbuild
index 22cbb124..519f5ec6 100644
--- a/sys/apps/acl/ympbuild
+++ b/sys/apps/acl/ympbuild
@@ -18,16 +18,12 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/acl
+        --libdir=/usr/lib64
 }
-https://gitlab.com/sulix/packages/binary-repo
 build(){
     make -j`nproc`
 }
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/acl/" > ${DESTDIR}/etc/ld.so.conf.d/acl.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/sys/apps/attr/ympbuild b/sys/apps/attr/ympbuild
index 7e221017..c4eb6b49 100644
--- a/sys/apps/attr/ympbuild
+++ b/sys/apps/attr/ympbuild
@@ -18,7 +18,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/attr
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -27,8 +27,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/attr/" > ${DESTDIR}/etc/ld.so.conf.d/attr.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/apps/file/ympbuild b/sys/apps/file/ympbuild
index 08bff351..eb266af8 100644
--- a/sys/apps/file/ympbuild
+++ b/sys/apps/file/ympbuild
@@ -22,10 +22,10 @@ cd $name-$version
 setup(){
     opts=(
     	--prefix=/usr
-	--libdir=/usr/lib64/magic
-	--enable-static
-	--enable-elf
-	--enable-elf-core
+        --libdir=/usr/lib64
+        --enable-static
+        --enable-elf
+        --enable-elf-core
     )
     ./configure ${opts[@]} \
 	$(use_opt zlib --enable-zlib --disable-zlib) \
@@ -40,7 +40,4 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/magic/" > ${DESTDIR}/etc/ld.so.conf.d/magic.conf
-    mv ${DESTDIR}/usr/lib64/{magic/pkgconfig,}
 }
diff --git a/sys/apps/shadow/ympbuild b/sys/apps/shadow/ympbuild
index 7b62ae1f..e62d2d0f 100644
--- a/sys/apps/shadow/ympbuild
+++ b/sys/apps/shadow/ympbuild
@@ -26,7 +26,7 @@ cd $name-$version
 setup(){
     autoreconf -fiv
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/shadow \
+        --libdir=/usr/lib64 \
         --sysconfdir=/etc \
         --bindir=/usr/bin \
         --sbindir=/usr/sbin \
@@ -49,7 +49,5 @@ package(){
     install -vDm 600 ../useradd.defaults "${DESTDIR}/etc/default/useradd"
     install -vDm 600 ../system-auth "${DESTDIR}/etc/pam.d/system-auth"
     install -vDm 755 ../shadow.sysconf ${DESTDIR}/etc/sysconf.d/shadow
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/shadow/" > ${DESTDIR}/etc/ld.so.conf.d/shadow.conf
 }
 
diff --git a/sys/apps/util-linux/ympbuild b/sys/apps/util-linux/ympbuild
index bb8861e4..fcf5cc73 100644
--- a/sys/apps/util-linux/ympbuild
+++ b/sys/apps/util-linux/ympbuild
@@ -20,7 +20,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-	--libdir=/usr/lib64/util-linux \
+	--libdir=/usr/lib64 \
 	--bindir=/usr/bin \
 	--enable-shared \
 	--enable-static \
@@ -47,8 +47,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/util-linux/" > ${DESTDIR}/etc/ld.so.conf.d/util-linux.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/apps/ymp/ympbuild b/sys/apps/ymp/ympbuild
index 4710643b..6a802afe 100644
--- a/sys/apps/ymp/ympbuild
+++ b/sys/apps/ymp/ympbuild
@@ -21,7 +21,7 @@ cd $name-$version
 
 setup(){
     meson setup build --prefix=/usr \
-        --libdir=/lib64/ymp \
+        --libdir=/lib64 \
         --bindir=/bin \
         -Dshared=true \
         -Dstatic=false \
@@ -37,7 +37,5 @@ build(){
 
 package(){
     ninja -C build install
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/lib64/ymp/" > ${DESTDIR}/etc/ld.so.conf.d/ymp.conf
 }
 
diff --git a/sys/devel/binutils/ympbuild b/sys/devel/binutils/ympbuild
index 48bc7c6c..1cba478d 100644
--- a/sys/devel/binutils/ympbuild
+++ b/sys/devel/binutils/ympbuild
@@ -23,7 +23,7 @@ setup(){
     mkdir build
     cd build
     ../configure --prefix=/usr \
-        --libdir=/usr/lib64/binutils \
+        --libdir=/usr/lib64 \
         --disable-nls \
         --disable-werror \
         --enable-cet \
@@ -55,7 +55,5 @@ build(){
 package(){
     cd build
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/binutils/" > ${DESTDIR}/etc/ld.so.conf.d/binutils.conf
 }
 
diff --git a/sys/devel/gettext/ympbuild b/sys/devel/gettext/ympbuild
index e572041f..59e2d3ca 100644
--- a/sys/devel/gettext/ympbuild
+++ b/sys/devel/gettext/ympbuild
@@ -20,7 +20,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/lib64/gettext \
+        --libdir=/lib64 \
         --enable-shared \
         --enable-static \
         --disable-java \
@@ -39,7 +39,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/lib64/gettext/" > ${DESTDIR}/etc/ld.so.conf.d/gettext.conf
 }
 
diff --git a/sys/devel/libtool/ympbuild b/sys/devel/libtool/ympbuild
index 1eb8b72b..ddea77a6 100644
--- a/sys/devel/libtool/ympbuild
+++ b/sys/devel/libtool/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libtool
+        --libdir=/usr/lib64
 }
 
 build(){
@@ -28,7 +28,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libtool/" > ${DESTDIR}/etc/ld.so.conf.d/libtool.conf
 }
 
diff --git a/sys/libs/gdbm/ympbuild b/sys/libs/gdbm/ympbuild
index d7a0b3f0..2ce05679 100644
--- a/sys/libs/gdbm/ympbuild
+++ b/sys/libs/gdbm/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/gdbm \
+        --libdir=/usr/lib64 \
         --enable-libgdbm-compat
 }
 
@@ -29,7 +29,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/gdbm/" > ${DESTDIR}/etc/ld.so.conf.d/gdbm.conf
 }
 
diff --git a/sys/libs/libcap-ng/ympbuild b/sys/libs/libcap-ng/ympbuild
index 5ff390d9..97564a06 100644
--- a/sys/libs/libcap-ng/ympbuild
+++ b/sys/libs/libcap-ng/ympbuild
@@ -22,7 +22,7 @@ cd $name-$version
 setup(){
     ./autogen.sh
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libcap-ng \
+        --libdir=/usr/lib64 \
         $(use_opt python --with-python --without-python) \
         $(use_opt python --with-python3 --without-python3)
 }
@@ -33,8 +33,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libcap-ng/" > ${DESTDIR}/etc/ld.so.conf.d/libcap-ng.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/libs/libcap/ympbuild b/sys/libs/libcap/ympbuild
index 8b7655fe..bac404cf 100644
--- a/sys/libs/libcap/ympbuild
+++ b/sys/libs/libcap/ympbuild
@@ -18,13 +18,10 @@ arch=('x86_64')
 cd $name-$version
 
 build(){
-      make DYNAMIC=yes KERNEL_HEADERS=/usr/include lib=lib64/libcap prefix=/usr
+      make DYNAMIC=yes KERNEL_HEADERS=/usr/include lib=lib64 prefix=/usr
 }
 
 package(){
     make RAISE_SETFCAP=no lib=lib64/libcap prefix=/usr install
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libcap/" > ${DESTDIR}/etc/ld.so.conf.d/libcap.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/libs/libxcrypt/ympbuild b/sys/libs/libxcrypt/ympbuild
index df29d9cb..fdaed594 100644
--- a/sys/libs/libxcrypt/ympbuild
+++ b/sys/libs/libxcrypt/ympbuild
@@ -25,12 +25,12 @@ prepare(){
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libxcrypt \
+        --libdir=/lib64 \
         --enable-hashes=strong,glibc \
         --enable-obsolete-api=glibc
     cd ../$name-compat
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/libxcrypt \
+        --libdir=/lib64 \
         --enable-hashes=strong,glibc \
         --enable-obsolete-api=no
 }
@@ -45,8 +45,5 @@ package(){
     make install -j`nproc`
     cd ../$name-compat
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/libxcrypt/" > ${DESTDIR}/etc/ld.so.conf.d/libxcrypt.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/libs/ncurses/ympbuild b/sys/libs/ncurses/ympbuild
index cdec9dc3..c7a52650 100644
--- a/sys/libs/ncurses/ympbuild
+++ b/sys/libs/ncurses/ympbuild
@@ -19,8 +19,8 @@ cd $name-$version
 setup(){
     cp -prf ../$name-$version ../widec
     opts=(--prefix=/usr
-          --libdir=/lib64/ncurses
-          --with-pkg-config-libdir=/usr/lib64/pkgconfig
+          --libdir=/lib64
+          --with-pkg-config-libdir=/lib64/pkgconfig
           --without-ada
           --without-tests
           --disable-termcap
@@ -71,8 +71,4 @@ package(){
     make -j$(nproc) install
     cd ../$name-$version
     make -j$(nproc) install
-    # fix lib64/ncurses
-    sed "s/^Libs:/& -L\$\{libdir\}/" -i "$DESTDIR"/usr/lib64/pkgconfig/*.pc
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/lib64/ncurses/" > ${DESTDIR}/etc/ld.so.conf.d/ncurses.conf
 }
diff --git a/sys/libs/readline/ympbuild b/sys/libs/readline/ympbuild
index 29bd92bd..822c0b54 100644
--- a/sys/libs/readline/ympbuild
+++ b/sys/libs/readline/ympbuild
@@ -19,7 +19,7 @@ cd $name-$version
 
 setup(){
     ./configure --prefix=/usr \
-        --libdir=/lib64/readline
+        --libdir=/lib64
 }
 
 build(){
@@ -27,8 +27,6 @@ build(){
 }
 
 package(){
-    make SHLIB_LIBS="-L/tools/lib -lncursesw" DESTDIR="$DESTDIR" install pkgconfigdir="/usr/lib64/pkgconfig"
+    make SHLIB_LIBS="-L/tools/lib -lncursesw" DESTDIR="$DESTDIR" install pkgconfigdir="/lib64/pkgconfig"
     install -Dm644 ../inputrc "$DESTDIR"/etc/inputrc
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/lib64/readline/" > ${DESTDIR}/etc/ld.so.conf.d/readline.conf
 }
diff --git a/sys/process/audit/ympbuild b/sys/process/audit/ympbuild
index 406120a1..592c5d74 100644
--- a/sys/process/audit/ympbuild
+++ b/sys/process/audit/ympbuild
@@ -22,7 +22,7 @@ cd audit-userspace-$version
 setup(){
     autoreconf -fv --install
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/audit \
+        --libdir=/usr/lib64 \
         --disable-zos-remote \
         --disable-listener \
         --disable-systemd \
@@ -38,8 +38,5 @@ build(){
 
 package(){
     make install -j`nproc`
-    mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
-    echo "/usr/lib64/audit/" > ${DESTDIR}/etc/ld.so.conf.d/audit.conf
-    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }