diff --git a/common/hooks/post-install/00-lib32.sh b/common/hooks/post-install/00-lib32.sh deleted file mode 100644 index f5c4fa259ec..00000000000 --- a/common/hooks/post-install/00-lib32.sh +++ /dev/null @@ -1,8 +0,0 @@ -# This hook removes the /usr/lib32 symlink on 32-bit systems. - -hook() { - if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \ - [ "${pkgname}" != "base-files" ]; then - rm -f ${PKGDESTDIR}/usr/lib32 - fi -} diff --git a/common/hooks/post-install/00-libdir.sh b/common/hooks/post-install/00-libdir.sh new file mode 100644 index 00000000000..21c7e35ea95 --- /dev/null +++ b/common/hooks/post-install/00-libdir.sh @@ -0,0 +1,7 @@ +# This hook removes the wordsize specific libdir symlink. + +hook() { + if [ "${pkgname}" != "base-files" ]; then + rm -f ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE} + fi +} diff --git a/common/hooks/pre-install/00-lib32.sh b/common/hooks/pre-install/00-lib32.sh deleted file mode 100644 index 0d97a825758..00000000000 --- a/common/hooks/pre-install/00-lib32.sh +++ /dev/null @@ -1,9 +0,0 @@ -# This hook creates the /usr/lib32 symlink for 32-bit systems. - -hook() { - if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \ - [ "${pkgname}" != "base-files" ]; then - vmkdir usr/lib - ln -sf lib ${PKGDESTDIR}/usr/lib32 - fi -} diff --git a/common/hooks/pre-install/00-libdir.sh b/common/hooks/pre-install/00-libdir.sh new file mode 100644 index 00000000000..f19f68088ff --- /dev/null +++ b/common/hooks/pre-install/00-libdir.sh @@ -0,0 +1,8 @@ +# This hook creates the wordsize specific libdir symlink. + +hook() { + if [ "${pkgname}" != "base-files" ]; then + vmkdir usr/lib + ln -sf lib ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE} + fi +}