From f39b658381d468a963db0091e165490da62abe4f Mon Sep 17 00:00:00 2001 From: PktSurf Date: Tue, 29 Oct 2024 20:12:47 +0530 Subject: [PATCH] Removed executable bit from some build files and discarded build options that set /bin path for elf files --- base/alsa-lib/alsa-lib.SMBuild | 0 base/alsa-plugins/alsa-plugins.SMBuild | 0 base/alsa-utils/alsa-utils.SMBuild | 0 base/argon2/argon2.SMBuild | 0 base/argp-standalone/argp-standalone.SMBuild | 0 base/asciidoc/asciidoc.SMBuild | 0 base/aspell/aspell.SMBuild | 0 base/aspell6/aspell6.SMBuild | 0 base/attr/attr.SMBuild | 0 base/autoconf/autoconf.SMBuild | 0 base/automake/automake.SMBuild | 0 base/bash-completion/bash-completion.SMBuild | 0 base/ed/ed.SMBuild | 2 +- base/gmime/gmime.SMBuild | 0 base/gmp/gmp.SMBuild | 0 base/haveged/haveged.SMBuild | 3 +-- base/id3lib/id3lib.SMBuild | 3 +-- base/initfs/initfs.SMBuild | 0 base/iso-codes/iso-codes.SMBuild | 0 base/itstool/itstool.SMBuild | 3 +-- base/jansson/jansson.SMBuild | 0 base/jbig2dec/jbig2dec.SMBuild | 1 - base/json-glib/json-glib.SMBuild | 1 - base/kbd/kbd.SMBuild | 2 +- base/keyutils/keyutils.SMBuild | 6 ++++-- base/kmod/kmod.SMBuild | 5 ++--- base/lame/lame.SMBuild | 1 - base/less/less.SMBuild | 3 +-- base/libaio/libaio.SMBuild | 0 base/libao/libao.SMBuild | 0 base/libarchive/libarchive.SMBuild | 3 +-- base/libasr/libasr.SMBuild | 0 base/libassuan/libassuan.SMBuild | 1 - base/libcap-ng/libcap-ng.SMBuild | 1 - base/libcap/libcap.SMBuild | 6 ++---- base/libcddb/libcddb.SMBuild | 1 - base/libcdio-paranoia/libcdio-paranoia.SMBuild | 1 - base/libcdio/libcdio.SMBuild | 1 - base/libcroco/libcroco.SMBuild | 1 - base/libcue/libcue.SMBuild | 0 base/libdaemon/libdaemon.SMBuild | 0 base/libelf-compat/libelf-compat.SMBuild | 0 base/libetpan/libetpan.SMBuild | 0 base/libevent/libevent.SMBuild | 1 - base/libexif/libexif.SMBuild | 0 base/libffi/libffi.SMBuild | 0 base/libgc/libgc.SMBuild | 0 base/libgcrypt/libgcrypt.SMBuild | 1 - base/libgit2/libgit2.SMBuild | 0 base/libgpg-error/libgpg-error.SMBuild | 1 - base/libical/libical.SMBuild | 0 base/libid3tag/libid3tag.SMBuild | 1 - base/libidn2/libidn2.SMBuild | 1 - base/libjpeg-turbo/libjpeg-turbo.SMBuild | 1 - base/libkate/libkate.SMBuild | 1 - base/libksba/libksba.SMBuild | 1 - base/libmilter/libmilter.SMBuild | 0 base/libminizip/libminizip.SMBuild | 0 base/libmms/libmms.SMBuild | 0 base/libmnl/libmnl.SMBuild | 0 base/libmodplug/libmodplug.SMBuild | 0 base/libmtp/libmtp.SMBuild | 3 +-- base/libmypaint/libmypaint.SMBuild | 0 base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild | 0 base/libnfnetlink/libnfnetlink.SMBuild | 0 base/libnfs/libnfs.SMBuild | 1 - base/libnl/libnl.SMBuild | 1 - base/libogg/libogg.SMBuild | 0 base/libopenal/libopenal.SMBuild | 1 - base/libpcap/libpcap.SMBuild | 1 - base/libplist/libplist.SMBuild | 1 - base/libpng/libpng.SMBuild | 1 - base/libpsl/libpsl.SMBuild | 1 - base/libpthread-stubs/libpthread-stubs.SMBuild | 0 base/libptytty/libptytty.SMBuild | 2 +- base/libqalculate/libqalculate.SMBuild | 1 - base/libsamplerate/libsamplerate.SMBuild | 1 - base/libseccomp/libseccomp.SMBuild | 1 - base/libsecret/libsecret.SMBuild | 1 - base/libshout/libshout.SMBuild | 0 base/libsndfile/libsndfile.SMBuild | 1 - base/libsodium/libsodium.SMBuild | 0 base/libssh2/libssh2.SMBuild | 0 base/libtasn1/libtasn1.SMBuild | 1 - base/libtheora/libtheora.SMBuild | 0 base/libtirpc/libtirpc.SMBuild | 0 base/libtool/libtool.SMBuild | 1 - base/libtorrent/libtorrent.SMBuild | 0 base/libunistring/libunistring.SMBuild | 0 base/libusb/libusb.SMBuild | 0 base/libuv/libuv.SMBuild | 0 base/libvncserver/libvncserver.SMBuild | 1 - base/libvorbis/libvorbis.SMBuild | 0 base/libvpx/libvpx.SMBuild | 0 base/libxml2/libxml2.SMBuild | 1 - base/libxslt/libxslt.SMBuild | 3 +-- base/p11-kit/p11-kit.SMBuild | 1 - base/parted/parted.SMBuild | 2 +- base/swig/swig.SMBuild | 3 +-- base/sysfsutils/sysfsutils.SMBuild | 1 - base/sysstat/sysstat.SMBuild | 1 - base/tarlz/tarlz.SMBuild | 1 - base/texinfo/texinfo.SMBuild | 1 - base/time/time.SMBuild | 3 +-- base/tofrodos/tofrodos.SMBuild | 4 ++-- base/toluapp/toluapp.SMBuild | 2 -- base/twolame/twolame.SMBuild | 1 - base/tzdb/tzdb.SMBuild | 4 ++-- base/usbutils/usbutils.SMBuild | 4 +--- base/util-linux/util-linux.SMBuild | 4 ++-- base/wavpack/wavpack.SMBuild | 1 - base/wayland/wayland.SMBuild | 1 - base/which/which.SMBuild | 3 +-- base/woff2/woff2.SMBuild | 1 - base/x264/x264.SMBuild | 3 +-- base/xmlto/xmlto.SMBuild | 5 ++--- base/xz/xz.SMBuild | 1 - base/yasm/yasm.SMBuild | 3 +-- base/zsh/zsh.SMBuild | 1 - base/zstd/zstd.SMBuild | 1 - 120 files changed, 33 insertions(+), 96 deletions(-) mode change 100755 => 100644 base/alsa-lib/alsa-lib.SMBuild mode change 100755 => 100644 base/alsa-plugins/alsa-plugins.SMBuild mode change 100755 => 100644 base/alsa-utils/alsa-utils.SMBuild mode change 100755 => 100644 base/argon2/argon2.SMBuild mode change 100755 => 100644 base/argp-standalone/argp-standalone.SMBuild mode change 100755 => 100644 base/asciidoc/asciidoc.SMBuild mode change 100755 => 100644 base/aspell/aspell.SMBuild mode change 100755 => 100644 base/aspell6/aspell6.SMBuild mode change 100755 => 100644 base/attr/attr.SMBuild mode change 100755 => 100644 base/autoconf/autoconf.SMBuild mode change 100755 => 100644 base/automake/automake.SMBuild mode change 100755 => 100644 base/bash-completion/bash-completion.SMBuild mode change 100755 => 100644 base/gmime/gmime.SMBuild mode change 100755 => 100644 base/gmp/gmp.SMBuild mode change 100755 => 100644 base/haveged/haveged.SMBuild mode change 100755 => 100644 base/id3lib/id3lib.SMBuild mode change 100755 => 100644 base/initfs/initfs.SMBuild mode change 100755 => 100644 base/iso-codes/iso-codes.SMBuild mode change 100755 => 100644 base/itstool/itstool.SMBuild mode change 100755 => 100644 base/jansson/jansson.SMBuild mode change 100755 => 100644 base/jbig2dec/jbig2dec.SMBuild mode change 100755 => 100644 base/json-glib/json-glib.SMBuild mode change 100755 => 100644 base/kbd/kbd.SMBuild mode change 100755 => 100644 base/keyutils/keyutils.SMBuild mode change 100755 => 100644 base/kmod/kmod.SMBuild mode change 100755 => 100644 base/lame/lame.SMBuild mode change 100755 => 100644 base/less/less.SMBuild mode change 100755 => 100644 base/libaio/libaio.SMBuild mode change 100755 => 100644 base/libao/libao.SMBuild mode change 100755 => 100644 base/libarchive/libarchive.SMBuild mode change 100755 => 100644 base/libasr/libasr.SMBuild mode change 100755 => 100644 base/libassuan/libassuan.SMBuild mode change 100755 => 100644 base/libcap-ng/libcap-ng.SMBuild mode change 100755 => 100644 base/libcap/libcap.SMBuild mode change 100755 => 100644 base/libcddb/libcddb.SMBuild mode change 100755 => 100644 base/libcdio-paranoia/libcdio-paranoia.SMBuild mode change 100755 => 100644 base/libcdio/libcdio.SMBuild mode change 100755 => 100644 base/libcroco/libcroco.SMBuild mode change 100755 => 100644 base/libcue/libcue.SMBuild mode change 100755 => 100644 base/libdaemon/libdaemon.SMBuild mode change 100755 => 100644 base/libelf-compat/libelf-compat.SMBuild mode change 100755 => 100644 base/libetpan/libetpan.SMBuild mode change 100755 => 100644 base/libevent/libevent.SMBuild mode change 100755 => 100644 base/libexif/libexif.SMBuild mode change 100755 => 100644 base/libffi/libffi.SMBuild mode change 100755 => 100644 base/libgc/libgc.SMBuild mode change 100755 => 100644 base/libgcrypt/libgcrypt.SMBuild mode change 100755 => 100644 base/libgit2/libgit2.SMBuild mode change 100755 => 100644 base/libgpg-error/libgpg-error.SMBuild mode change 100755 => 100644 base/libical/libical.SMBuild mode change 100755 => 100644 base/libid3tag/libid3tag.SMBuild mode change 100755 => 100644 base/libidn2/libidn2.SMBuild mode change 100755 => 100644 base/libjpeg-turbo/libjpeg-turbo.SMBuild mode change 100755 => 100644 base/libkate/libkate.SMBuild mode change 100755 => 100644 base/libksba/libksba.SMBuild mode change 100755 => 100644 base/libmilter/libmilter.SMBuild mode change 100755 => 100644 base/libminizip/libminizip.SMBuild mode change 100755 => 100644 base/libmms/libmms.SMBuild mode change 100755 => 100644 base/libmnl/libmnl.SMBuild mode change 100755 => 100644 base/libmodplug/libmodplug.SMBuild mode change 100755 => 100644 base/libmtp/libmtp.SMBuild mode change 100755 => 100644 base/libmypaint/libmypaint.SMBuild mode change 100755 => 100644 base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild mode change 100755 => 100644 base/libnfnetlink/libnfnetlink.SMBuild mode change 100755 => 100644 base/libnfs/libnfs.SMBuild mode change 100755 => 100644 base/libnl/libnl.SMBuild mode change 100755 => 100644 base/libogg/libogg.SMBuild mode change 100755 => 100644 base/libopenal/libopenal.SMBuild mode change 100755 => 100644 base/libpcap/libpcap.SMBuild mode change 100755 => 100644 base/libplist/libplist.SMBuild mode change 100755 => 100644 base/libpng/libpng.SMBuild mode change 100755 => 100644 base/libpsl/libpsl.SMBuild mode change 100755 => 100644 base/libpthread-stubs/libpthread-stubs.SMBuild mode change 100755 => 100644 base/libptytty/libptytty.SMBuild mode change 100755 => 100644 base/libqalculate/libqalculate.SMBuild mode change 100755 => 100644 base/libsamplerate/libsamplerate.SMBuild mode change 100755 => 100644 base/libseccomp/libseccomp.SMBuild mode change 100755 => 100644 base/libsecret/libsecret.SMBuild mode change 100755 => 100644 base/libshout/libshout.SMBuild mode change 100755 => 100644 base/libsndfile/libsndfile.SMBuild mode change 100755 => 100644 base/libsodium/libsodium.SMBuild mode change 100755 => 100644 base/libssh2/libssh2.SMBuild mode change 100755 => 100644 base/libtasn1/libtasn1.SMBuild mode change 100755 => 100644 base/libtheora/libtheora.SMBuild mode change 100755 => 100644 base/libtirpc/libtirpc.SMBuild mode change 100755 => 100644 base/libtool/libtool.SMBuild mode change 100755 => 100644 base/libtorrent/libtorrent.SMBuild mode change 100755 => 100644 base/libunistring/libunistring.SMBuild mode change 100755 => 100644 base/libusb/libusb.SMBuild mode change 100755 => 100644 base/libuv/libuv.SMBuild mode change 100755 => 100644 base/libvncserver/libvncserver.SMBuild mode change 100755 => 100644 base/libvorbis/libvorbis.SMBuild mode change 100755 => 100644 base/libvpx/libvpx.SMBuild mode change 100755 => 100644 base/libxml2/libxml2.SMBuild mode change 100755 => 100644 base/libxslt/libxslt.SMBuild mode change 100755 => 100644 base/p11-kit/p11-kit.SMBuild mode change 100755 => 100644 base/parted/parted.SMBuild mode change 100755 => 100644 base/swig/swig.SMBuild mode change 100755 => 100644 base/sysfsutils/sysfsutils.SMBuild mode change 100755 => 100644 base/sysstat/sysstat.SMBuild mode change 100755 => 100644 base/tarlz/tarlz.SMBuild mode change 100755 => 100644 base/texinfo/texinfo.SMBuild mode change 100755 => 100644 base/time/time.SMBuild mode change 100755 => 100644 base/tofrodos/tofrodos.SMBuild mode change 100755 => 100644 base/toluapp/toluapp.SMBuild mode change 100755 => 100644 base/twolame/twolame.SMBuild mode change 100755 => 100644 base/tzdb/tzdb.SMBuild mode change 100755 => 100644 base/usbutils/usbutils.SMBuild mode change 100755 => 100644 base/util-linux/util-linux.SMBuild mode change 100755 => 100644 base/wavpack/wavpack.SMBuild mode change 100755 => 100644 base/wayland/wayland.SMBuild mode change 100755 => 100644 base/which/which.SMBuild mode change 100755 => 100644 base/woff2/woff2.SMBuild mode change 100755 => 100644 base/x264/x264.SMBuild mode change 100755 => 100644 base/xmlto/xmlto.SMBuild mode change 100755 => 100644 base/xz/xz.SMBuild mode change 100755 => 100644 base/yasm/yasm.SMBuild mode change 100755 => 100644 base/zsh/zsh.SMBuild mode change 100755 => 100644 base/zstd/zstd.SMBuild diff --git a/base/alsa-lib/alsa-lib.SMBuild b/base/alsa-lib/alsa-lib.SMBuild old mode 100755 new mode 100644 diff --git a/base/alsa-plugins/alsa-plugins.SMBuild b/base/alsa-plugins/alsa-plugins.SMBuild old mode 100755 new mode 100644 diff --git a/base/alsa-utils/alsa-utils.SMBuild b/base/alsa-utils/alsa-utils.SMBuild old mode 100755 new mode 100644 diff --git a/base/argon2/argon2.SMBuild b/base/argon2/argon2.SMBuild old mode 100755 new mode 100644 diff --git a/base/argp-standalone/argp-standalone.SMBuild b/base/argp-standalone/argp-standalone.SMBuild old mode 100755 new mode 100644 diff --git a/base/asciidoc/asciidoc.SMBuild b/base/asciidoc/asciidoc.SMBuild old mode 100755 new mode 100644 diff --git a/base/aspell/aspell.SMBuild b/base/aspell/aspell.SMBuild old mode 100755 new mode 100644 diff --git a/base/aspell6/aspell6.SMBuild b/base/aspell6/aspell6.SMBuild old mode 100755 new mode 100644 diff --git a/base/attr/attr.SMBuild b/base/attr/attr.SMBuild old mode 100755 new mode 100644 diff --git a/base/autoconf/autoconf.SMBuild b/base/autoconf/autoconf.SMBuild old mode 100755 new mode 100644 diff --git a/base/automake/automake.SMBuild b/base/automake/automake.SMBuild old mode 100755 new mode 100644 diff --git a/base/bash-completion/bash-completion.SMBuild b/base/bash-completion/bash-completion.SMBuild old mode 100755 new mode 100644 diff --git a/base/ed/ed.SMBuild b/base/ed/ed.SMBuild index 10637a2..5a636ac 100644 --- a/base/ed/ed.SMBuild +++ b/base/ed/ed.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ + --prefix=/usr make CFLAGS="$CFLAGS" make install DESTDIR=$pkg diff --git a/base/gmime/gmime.SMBuild b/base/gmime/gmime.SMBuild old mode 100755 new mode 100644 diff --git a/base/gmp/gmp.SMBuild b/base/gmp/gmp.SMBuild old mode 100755 new mode 100644 diff --git a/base/haveged/haveged.SMBuild b/base/haveged/haveged.SMBuild old mode 100755 new mode 100644 index a5d98d0..9883924 --- a/base/haveged/haveged.SMBuild +++ b/base/haveged/haveged.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --disable-static make diff --git a/base/id3lib/id3lib.SMBuild b/base/id3lib/id3lib.SMBuild old mode 100755 new mode 100644 index a28ccda..63e4af3 --- a/base/id3lib/id3lib.SMBuild +++ b/base/id3lib/id3lib.SMBuild @@ -30,8 +30,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/initfs/initfs.SMBuild b/base/initfs/initfs.SMBuild old mode 100755 new mode 100644 diff --git a/base/iso-codes/iso-codes.SMBuild b/base/iso-codes/iso-codes.SMBuild old mode 100755 new mode 100644 diff --git a/base/itstool/itstool.SMBuild b/base/itstool/itstool.SMBuild old mode 100755 new mode 100644 index 449addb..beddb04 --- a/base/itstool/itstool.SMBuild +++ b/base/itstool/itstool.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/jansson/jansson.SMBuild b/base/jansson/jansson.SMBuild old mode 100755 new mode 100644 diff --git a/base/jbig2dec/jbig2dec.SMBuild b/base/jbig2dec/jbig2dec.SMBuild old mode 100755 new mode 100644 index 715840d..2c51839 --- a/base/jbig2dec/jbig2dec.SMBuild +++ b/base/jbig2dec/jbig2dec.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --enable-shared diff --git a/base/json-glib/json-glib.SMBuild b/base/json-glib/json-glib.SMBuild old mode 100755 new mode 100644 index 0751525..deec9d3 --- a/base/json-glib/json-glib.SMBuild +++ b/base/json-glib/json-glib.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. --prefix=/usr \ - --bindir=/bin \ -Dintrospection=false ninja diff --git a/base/kbd/kbd.SMBuild b/base/kbd/kbd.SMBuild old mode 100755 new mode 100644 index c3944f6..7f03a7f --- a/base/kbd/kbd.SMBuild +++ b/base/kbd/kbd.SMBuild @@ -42,7 +42,7 @@ build() { ./loadkeys -b -q data/keymaps/i386/$i > "$pkg"/usr/share/kmap/$k.kmap || echo "Error loadkeys...$i" done - install -Dm 755 $srcdir/loadkeys $pkg/bin/loadkeys + install -Dm 755 $srcdir/loadkeys $pkg/usr/bin/loadkeys cp COPYING $pkgdocs/ diff --git a/base/keyutils/keyutils.SMBuild b/base/keyutils/keyutils.SMBuild old mode 100755 new mode 100644 index 62c2858..f5586cc --- a/base/keyutils/keyutils.SMBuild +++ b/base/keyutils/keyutils.SMBuild @@ -19,7 +19,8 @@ build() { make -j1 NO_ARLIB=1 \ LIBDIR=/usr/lib \ USRLIBDIR=/usr/lib \ - SBINDIR=/bin \ + BINDIR=/usr/bin \ + SBINDIR=/usr/bin \ MANDIR=/usr/share/man \ SHAREDIR=/usr/share \ INCLUDEDIR=/usr/include \ @@ -30,7 +31,8 @@ build() { make -j1 NO_ARLIB=1 \ LIBDIR=/usr/lib \ USRLIBDIR=/usr/lib \ - SBINDIR=/bin \ + BINDIR=/usr/bin \ + SBINDIR=/usr/bin \ MANDIR=/usr/share/man \ SHAREDIR=/usr/share \ INCLUDEDIR=/usr/include \ diff --git a/base/kmod/kmod.SMBuild b/base/kmod/kmod.SMBuild old mode 100755 new mode 100644 index 163f65d..78c66b5 --- a/base/kmod/kmod.SMBuild +++ b/base/kmod/kmod.SMBuild @@ -20,8 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg @@ -29,7 +28,7 @@ build() { cp COPYING $pkgdocs/ ( - cd $pkg/bin + cd $pkg/usr/bin for file in depmod insmod lsmod modinfo modprobe rmmod ; do ln -sf kmod $file done diff --git a/base/lame/lame.SMBuild b/base/lame/lame.SMBuild old mode 100755 new mode 100644 index 1eaf8d2..733e3cb --- a/base/lame/lame.SMBuild +++ b/base/lame/lame.SMBuild @@ -20,7 +20,6 @@ build() { LIBS="-lcurses -lterminfo" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared \ --enable-nasm \ --disable-static diff --git a/base/less/less.SMBuild b/base/less/less.SMBuild old mode 100755 new mode 100644 index 94e67eb..7fbec3a --- a/base/less/less.SMBuild +++ b/base/less/less.SMBuild @@ -22,8 +22,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/libaio/libaio.SMBuild b/base/libaio/libaio.SMBuild old mode 100755 new mode 100644 diff --git a/base/libao/libao.SMBuild b/base/libao/libao.SMBuild old mode 100755 new mode 100644 diff --git a/base/libarchive/libarchive.SMBuild b/base/libarchive/libarchive.SMBuild old mode 100755 new mode 100644 index 11d514c..e6afd81 --- a/base/libarchive/libarchive.SMBuild +++ b/base/libarchive/libarchive.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --with-pic \ --without-openssl \ --without-xml2 \ @@ -37,4 +36,4 @@ build() { sha512sums=" 71a69f6ef8049167e3901b0fea2dc872888d9a9373e77921a5b3831ea20a9a63506e8e28e75d617d0e91740d324ef13d6beedf0a92fca1d49a86cd9a833defe4 libarchive-3.7.6.tar.lz -" \ No newline at end of file +" diff --git a/base/libasr/libasr.SMBuild b/base/libasr/libasr.SMBuild old mode 100755 new mode 100644 diff --git a/base/libassuan/libassuan.SMBuild b/base/libassuan/libassuan.SMBuild old mode 100755 new mode 100644 index f7cc7c8..fcc1b6c --- a/base/libassuan/libassuan.SMBuild +++ b/base/libassuan/libassuan.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libcap-ng/libcap-ng.SMBuild b/base/libcap-ng/libcap-ng.SMBuild old mode 100755 new mode 100644 index 2045660..fb5fd35 --- a/base/libcap-ng/libcap-ng.SMBuild +++ b/base/libcap-ng/libcap-ng.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-static=no \ --with-python=no \ --with-python3=no diff --git a/base/libcap/libcap.SMBuild b/base/libcap/libcap.SMBuild old mode 100755 new mode 100644 index 9c393fc..148047a --- a/base/libcap/libcap.SMBuild +++ b/base/libcap/libcap.SMBuild @@ -23,16 +23,14 @@ prepbuilddir() { } build() { - make prefix= man_prefix=/share/man lib=lib CFLAGS="$CFLAGS" \ + make prefix=/usr man_prefix=/usr/share/man lib=lib CFLAGS="$CFLAGS" \ BUILD_CC="$CC" - make FAKEROOT=$pkg prefix= man_prefix=/share/man SBINDIR=/bin lib=lib install + make FAKEROOT=$pkg prefix=/usr man_prefix=/usr/share/man SBINDIR=/usr/bin lib=lib install LIBDIR=$pkg/lib SBINDIR=$pkg/bin - #LD_LIBRARY_PATH=${LIBDIR} ${SBINDIR}/setcap cap_setfacap=i ${SBINDIR}/setcap || echo "oops" - cp License $pkgdocs/ mkfinalpkg diff --git a/base/libcddb/libcddb.SMBuild b/base/libcddb/libcddb.SMBuild old mode 100755 new mode 100644 index c35f1af..f7d5809 --- a/base/libcddb/libcddb.SMBuild +++ b/base/libcddb/libcddb.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libcdio-paranoia/libcdio-paranoia.SMBuild b/base/libcdio-paranoia/libcdio-paranoia.SMBuild old mode 100755 new mode 100644 index adf9a53..590d469 --- a/base/libcdio-paranoia/libcdio-paranoia.SMBuild +++ b/base/libcdio-paranoia/libcdio-paranoia.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-cpp-progs \ --disable-static \ --disable-example-progs diff --git a/base/libcdio/libcdio.SMBuild b/base/libcdio/libcdio.SMBuild old mode 100755 new mode 100644 index 7db1ce3..55a3bbf --- a/base/libcdio/libcdio.SMBuild +++ b/base/libcdio/libcdio.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-vcd-info \ --disable-static \ --enable-cpp-progs diff --git a/base/libcroco/libcroco.SMBuild b/base/libcroco/libcroco.SMBuild old mode 100755 new mode 100644 index 8c2e4da..f88894e --- a/base/libcroco/libcroco.SMBuild +++ b/base/libcroco/libcroco.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libcue/libcue.SMBuild b/base/libcue/libcue.SMBuild old mode 100755 new mode 100644 diff --git a/base/libdaemon/libdaemon.SMBuild b/base/libdaemon/libdaemon.SMBuild old mode 100755 new mode 100644 diff --git a/base/libelf-compat/libelf-compat.SMBuild b/base/libelf-compat/libelf-compat.SMBuild old mode 100755 new mode 100644 diff --git a/base/libetpan/libetpan.SMBuild b/base/libetpan/libetpan.SMBuild old mode 100755 new mode 100644 diff --git a/base/libevent/libevent.SMBuild b/base/libevent/libevent.SMBuild old mode 100755 new mode 100644 index 7ddf134..36e97b8 --- a/base/libevent/libevent.SMBuild +++ b/base/libevent/libevent.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libexif/libexif.SMBuild b/base/libexif/libexif.SMBuild old mode 100755 new mode 100644 diff --git a/base/libffi/libffi.SMBuild b/base/libffi/libffi.SMBuild old mode 100755 new mode 100644 diff --git a/base/libgc/libgc.SMBuild b/base/libgc/libgc.SMBuild old mode 100755 new mode 100644 diff --git a/base/libgcrypt/libgcrypt.SMBuild b/base/libgcrypt/libgcrypt.SMBuild old mode 100755 new mode 100644 index d54f6c8..ffbe1cf --- a/base/libgcrypt/libgcrypt.SMBuild +++ b/base/libgcrypt/libgcrypt.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared=yes \ --enable-static=no \ --program-prefix="" \ diff --git a/base/libgit2/libgit2.SMBuild b/base/libgit2/libgit2.SMBuild old mode 100755 new mode 100644 diff --git a/base/libgpg-error/libgpg-error.SMBuild b/base/libgpg-error/libgpg-error.SMBuild old mode 100755 new mode 100644 index 3c64491..42f2731 --- a/base/libgpg-error/libgpg-error.SMBuild +++ b/base/libgpg-error/libgpg-error.SMBuild @@ -22,7 +22,6 @@ build() { autoreconf -vif ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-install-gpg-error-config \ --disable-nls diff --git a/base/libical/libical.SMBuild b/base/libical/libical.SMBuild old mode 100755 new mode 100644 diff --git a/base/libid3tag/libid3tag.SMBuild b/base/libid3tag/libid3tag.SMBuild old mode 100755 new mode 100644 index 145b4d7..bfa0f29 --- a/base/libid3tag/libid3tag.SMBuild +++ b/base/libid3tag/libid3tag.SMBuild @@ -20,7 +20,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libidn2/libidn2.SMBuild b/base/libidn2/libidn2.SMBuild old mode 100755 new mode 100644 index 3fb950d..1aaa196 --- a/base/libidn2/libidn2.SMBuild +++ b/base/libidn2/libidn2.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-nls diff --git a/base/libjpeg-turbo/libjpeg-turbo.SMBuild b/base/libjpeg-turbo/libjpeg-turbo.SMBuild old mode 100755 new mode 100644 index fea9020..3c54500 --- a/base/libjpeg-turbo/libjpeg-turbo.SMBuild +++ b/base/libjpeg-turbo/libjpeg-turbo.SMBuild @@ -19,7 +19,6 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_BINDIR="/bin" \ -DCMAKE_INSTALL_LIBDIR="/usr/lib" \ -DENABLE_STATIC=OFF diff --git a/base/libkate/libkate.SMBuild b/base/libkate/libkate.SMBuild old mode 100755 new mode 100644 index 1fc9155..13614e1 --- a/base/libkate/libkate.SMBuild +++ b/base/libkate/libkate.SMBuild @@ -24,7 +24,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libksba/libksba.SMBuild b/base/libksba/libksba.SMBuild old mode 100755 new mode 100644 index dc85eb1..2417fac --- a/base/libksba/libksba.SMBuild +++ b/base/libksba/libksba.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared=yes \ --enable-static=no diff --git a/base/libmilter/libmilter.SMBuild b/base/libmilter/libmilter.SMBuild old mode 100755 new mode 100644 diff --git a/base/libminizip/libminizip.SMBuild b/base/libminizip/libminizip.SMBuild old mode 100755 new mode 100644 diff --git a/base/libmms/libmms.SMBuild b/base/libmms/libmms.SMBuild old mode 100755 new mode 100644 diff --git a/base/libmnl/libmnl.SMBuild b/base/libmnl/libmnl.SMBuild old mode 100755 new mode 100644 diff --git a/base/libmodplug/libmodplug.SMBuild b/base/libmodplug/libmodplug.SMBuild old mode 100755 new mode 100644 diff --git a/base/libmtp/libmtp.SMBuild b/base/libmtp/libmtp.SMBuild old mode 100755 new mode 100644 index d22c1d5..2148dd8 --- a/base/libmtp/libmtp.SMBuild +++ b/base/libmtp/libmtp.SMBuild @@ -18,9 +18,8 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ - --with-udev=/lib/udev + --with-udev=/usr/lib/udev make make install DESTDIR=$pkg diff --git a/base/libmypaint/libmypaint.SMBuild b/base/libmypaint/libmypaint.SMBuild old mode 100755 new mode 100644 diff --git a/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild b/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild old mode 100755 new mode 100644 diff --git a/base/libnfnetlink/libnfnetlink.SMBuild b/base/libnfnetlink/libnfnetlink.SMBuild old mode 100755 new mode 100644 diff --git a/base/libnfs/libnfs.SMBuild b/base/libnfs/libnfs.SMBuild old mode 100755 new mode 100644 index 81571f3..b0adc2d --- a/base/libnfs/libnfs.SMBuild +++ b/base/libnfs/libnfs.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libnl/libnl.SMBuild b/base/libnl/libnl.SMBuild old mode 100755 new mode 100644 index 2e64593..8a28c97 --- a/base/libnl/libnl.SMBuild +++ b/base/libnl/libnl.SMBuild @@ -18,7 +18,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libogg/libogg.SMBuild b/base/libogg/libogg.SMBuild old mode 100755 new mode 100644 diff --git a/base/libopenal/libopenal.SMBuild b/base/libopenal/libopenal.SMBuild old mode 100755 new mode 100644 index 51c181a..400a601 --- a/base/libopenal/libopenal.SMBuild +++ b/base/libopenal/libopenal.SMBuild @@ -19,7 +19,6 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_BINDIR=/bin \ -DCMAKE_INSTALL_LIBDIR=lib make diff --git a/base/libpcap/libpcap.SMBuild b/base/libpcap/libpcap.SMBuild old mode 100755 new mode 100644 index 065b4eb..800aee6 --- a/base/libpcap/libpcap.SMBuild +++ b/base/libpcap/libpcap.SMBuild @@ -21,7 +21,6 @@ build() { ac_cv_type_u_int64_t=yes \ ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared \ --with-libnl \ --enable-usb \ diff --git a/base/libplist/libplist.SMBuild b/base/libplist/libplist.SMBuild old mode 100755 new mode 100644 index 15ddfbc..2ad348f --- a/base/libplist/libplist.SMBuild +++ b/base/libplist/libplist.SMBuild @@ -21,7 +21,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libpng/libpng.SMBuild b/base/libpng/libpng.SMBuild old mode 100755 new mode 100644 index b69a5db..8a6bf13 --- a/base/libpng/libpng.SMBuild +++ b/base/libpng/libpng.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libpsl/libpsl.SMBuild b/base/libpsl/libpsl.SMBuild old mode 100755 new mode 100644 index 5470b2c..c88922b --- a/base/libpsl/libpsl.SMBuild +++ b/base/libpsl/libpsl.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libpthread-stubs/libpthread-stubs.SMBuild b/base/libpthread-stubs/libpthread-stubs.SMBuild old mode 100755 new mode 100644 diff --git a/base/libptytty/libptytty.SMBuild b/base/libptytty/libptytty.SMBuild old mode 100755 new mode 100644 index f1db89f..c65b3c8 --- a/base/libptytty/libptytty.SMBuild +++ b/base/libptytty/libptytty.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_LIBDIR=lib \ -DUTMP_SUPPORT=OFF \ diff --git a/base/libqalculate/libqalculate.SMBuild b/base/libqalculate/libqalculate.SMBuild old mode 100755 new mode 100644 index 758b469..d9aa9fa --- a/base/libqalculate/libqalculate.SMBuild +++ b/base/libqalculate/libqalculate.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-nls diff --git a/base/libsamplerate/libsamplerate.SMBuild b/base/libsamplerate/libsamplerate.SMBuild old mode 100755 new mode 100644 index 13fd34a..8fd425e --- a/base/libsamplerate/libsamplerate.SMBuild +++ b/base/libsamplerate/libsamplerate.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libseccomp/libseccomp.SMBuild b/base/libseccomp/libseccomp.SMBuild old mode 100755 new mode 100644 index a467a43..d37e86f --- a/base/libseccomp/libseccomp.SMBuild +++ b/base/libseccomp/libseccomp.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libsecret/libsecret.SMBuild b/base/libsecret/libsecret.SMBuild old mode 100755 new mode 100644 index 32fe0e6..a40baa8 --- a/base/libsecret/libsecret.SMBuild +++ b/base/libsecret/libsecret.SMBuild @@ -20,7 +20,6 @@ build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-introspection \ --disable-manpages \ diff --git a/base/libshout/libshout.SMBuild b/base/libshout/libshout.SMBuild old mode 100755 new mode 100644 diff --git a/base/libsndfile/libsndfile.SMBuild b/base/libsndfile/libsndfile.SMBuild old mode 100755 new mode 100644 index b105170..13416aa --- a/base/libsndfile/libsndfile.SMBuild +++ b/base/libsndfile/libsndfile.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libsodium/libsodium.SMBuild b/base/libsodium/libsodium.SMBuild old mode 100755 new mode 100644 diff --git a/base/libssh2/libssh2.SMBuild b/base/libssh2/libssh2.SMBuild old mode 100755 new mode 100644 diff --git a/base/libtasn1/libtasn1.SMBuild b/base/libtasn1/libtasn1.SMBuild old mode 100755 new mode 100644 index cf21150..cf79166 --- a/base/libtasn1/libtasn1.SMBuild +++ b/base/libtasn1/libtasn1.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libtheora/libtheora.SMBuild b/base/libtheora/libtheora.SMBuild old mode 100755 new mode 100644 diff --git a/base/libtirpc/libtirpc.SMBuild b/base/libtirpc/libtirpc.SMBuild old mode 100755 new mode 100644 diff --git a/base/libtool/libtool.SMBuild b/base/libtool/libtool.SMBuild old mode 100755 new mode 100644 index 2450261..c488f23 --- a/base/libtool/libtool.SMBuild +++ b/base/libtool/libtool.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/libtorrent/libtorrent.SMBuild b/base/libtorrent/libtorrent.SMBuild old mode 100755 new mode 100644 diff --git a/base/libunistring/libunistring.SMBuild b/base/libunistring/libunistring.SMBuild old mode 100755 new mode 100644 diff --git a/base/libusb/libusb.SMBuild b/base/libusb/libusb.SMBuild old mode 100755 new mode 100644 diff --git a/base/libuv/libuv.SMBuild b/base/libuv/libuv.SMBuild old mode 100755 new mode 100644 diff --git a/base/libvncserver/libvncserver.SMBuild b/base/libvncserver/libvncserver.SMBuild old mode 100755 new mode 100644 index c16035b..671fb5e --- a/base/libvncserver/libvncserver.SMBuild +++ b/base/libvncserver/libvncserver.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --without-ssl diff --git a/base/libvorbis/libvorbis.SMBuild b/base/libvorbis/libvorbis.SMBuild old mode 100755 new mode 100644 diff --git a/base/libvpx/libvpx.SMBuild b/base/libvpx/libvpx.SMBuild old mode 100755 new mode 100644 diff --git a/base/libxml2/libxml2.SMBuild b/base/libxml2/libxml2.SMBuild old mode 100755 new mode 100644 index a6ba8ac..7824c01 --- a/base/libxml2/libxml2.SMBuild +++ b/base/libxml2/libxml2.SMBuild @@ -21,7 +21,6 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --bindir=/bin \ --disable-static \ --with-legacy \ --with-history diff --git a/base/libxslt/libxslt.SMBuild b/base/libxslt/libxslt.SMBuild old mode 100755 new mode 100644 index 30205c3..4095bf8 --- a/base/libxslt/libxslt.SMBuild +++ b/base/libxslt/libxslt.SMBuild @@ -21,9 +21,8 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ - --with-python=/bin/python + --with-python=/usr/bin/python make make install DESTDIR=$pkg diff --git a/base/p11-kit/p11-kit.SMBuild b/base/p11-kit/p11-kit.SMBuild old mode 100755 new mode 100644 index f3c0ff7..89dc63a --- a/base/p11-kit/p11-kit.SMBuild +++ b/base/p11-kit/p11-kit.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --without-trust-paths make diff --git a/base/parted/parted.SMBuild b/base/parted/parted.SMBuild old mode 100755 new mode 100644 index 5fc76d3..bd81fab --- a/base/parted/parted.SMBuild +++ b/base/parted/parted.SMBuild @@ -23,7 +23,7 @@ build() { CFLAGS+=" -Dloff_t=off_t -include sys/sysmacros.h" \ ./configure \ --prefix=/usr \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --enable-threads=posix \ --disable-static diff --git a/base/swig/swig.SMBuild b/base/swig/swig.SMBuild old mode 100755 new mode 100644 index 3ae638c..944a7bc --- a/base/swig/swig.SMBuild +++ b/base/swig/swig.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/sysfsutils/sysfsutils.SMBuild b/base/sysfsutils/sysfsutils.SMBuild old mode 100755 new mode 100644 index 24a0f3f..b45688f --- a/base/sysfsutils/sysfsutils.SMBuild +++ b/base/sysfsutils/sysfsutils.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --mandir=/usr/share/man \ --disable-static diff --git a/base/sysstat/sysstat.SMBuild b/base/sysstat/sysstat.SMBuild old mode 100755 new mode 100644 index eb82827..ab9ce37 --- a/base/sysstat/sysstat.SMBuild +++ b/base/sysstat/sysstat.SMBuild @@ -24,7 +24,6 @@ build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-nls make diff --git a/base/tarlz/tarlz.SMBuild b/base/tarlz/tarlz.SMBuild old mode 100755 new mode 100644 index 056022c..897962d --- a/base/tarlz/tarlz.SMBuild +++ b/base/tarlz/tarlz.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ CXXFLAGS="$CXXFLAGS" \ make diff --git a/base/texinfo/texinfo.SMBuild b/base/texinfo/texinfo.SMBuild old mode 100755 new mode 100644 index fdb81c8..3fedde9 --- a/base/texinfo/texinfo.SMBuild +++ b/base/texinfo/texinfo.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-nls make diff --git a/base/time/time.SMBuild b/base/time/time.SMBuild old mode 100755 new mode 100644 index a48f73e..544b9c0 --- a/base/time/time.SMBuild +++ b/base/time/time.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/tofrodos/tofrodos.SMBuild b/base/tofrodos/tofrodos.SMBuild old mode 100755 new mode 100644 index 5bcbb86..ed5a85c --- a/base/tofrodos/tofrodos.SMBuild +++ b/base/tofrodos/tofrodos.SMBuild @@ -20,10 +20,10 @@ build() { cd src make - install -Dm 755 fromdos $pkg/bin/fromdos + install -Dm 755 fromdos $pkg/usr/bin/fromdos install -Dm 644 fromdos.1 $pkg/usr/share/man/man1/fromdos.1 - ( cd $pkg/bin ; ln -s fromdos todos ) + ( cd $pkg/usr/bin ; ln -s fromdos todos ) ( cd $pkg/usr/share/man/man1 ; ln -s fromdos.1 todos.1 ) cp ../COPYING $pkgdocs/ diff --git a/base/toluapp/toluapp.SMBuild b/base/toluapp/toluapp.SMBuild old mode 100755 new mode 100644 index aa28c0d..132d1b4 --- a/base/toluapp/toluapp.SMBuild +++ b/base/toluapp/toluapp.SMBuild @@ -20,14 +20,12 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_BINDIR=/bin \ -DCMAKE_BUILD_TYPE=Release make make install DESTDIR=$pkg cp ../README* $pkgdocs/ - mv $pkg/usr/bin $pkg/ mkfinalpkg } diff --git a/base/twolame/twolame.SMBuild b/base/twolame/twolame.SMBuild old mode 100755 new mode 100644 index 961047c..a15b4ef --- a/base/twolame/twolame.SMBuild +++ b/base/twolame/twolame.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/tzdb/tzdb.SMBuild b/base/tzdb/tzdb.SMBuild old mode 100755 new mode 100644 index 5738a39..a6a90ee --- a/base/tzdb/tzdb.SMBuild +++ b/base/tzdb/tzdb.SMBuild @@ -20,8 +20,8 @@ build() { make install CC="$CC" \ DESTDIR=$pkg \ USRDIR="/usr" \ - BINDIR="/bin" \ - ZICDIR="/bin" + BINDIR=/usr/bin \ + ZICDIR=/usr/bin cp LICENSE $pkgdocs/ diff --git a/base/usbutils/usbutils.SMBuild b/base/usbutils/usbutils.SMBuild old mode 100755 new mode 100644 index a93c042..8d1f3b8 --- a/base/usbutils/usbutils.SMBuild +++ b/base/usbutils/usbutils.SMBuild @@ -20,14 +20,12 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --bindir=/bin \ - --sbindir=/bin \ --datadir=/usr/share/hwdata make make install DESTDIR=$pkg - cp usbreset $pkg/bin/ + install -Dm 755 usbreset $pkg/usr/bin/usbreset cp LICENSES/* $pkgdocs/ diff --git a/base/util-linux/util-linux.SMBuild b/base/util-linux/util-linux.SMBuild old mode 100755 new mode 100644 index 2e611fd..2fcf01a --- a/base/util-linux/util-linux.SMBuild +++ b/base/util-linux/util-linux.SMBuild @@ -23,7 +23,7 @@ prepbuilddir() { build() { LDFLAGS="-lcurses -lterminfo" \ ./configure \ - --prefix=/ --bindir=/bin --sbindir=/bin --mandir=/usr/share/man \ + --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin --mandir=/usr/share/man \ --disable-fsck --includedir=/usr/include --libdir=/usr/lib \ --with-bashcompletiondir=/usr/share/bash-completion/completions \ --datarootdir=/usr/share \ @@ -44,7 +44,7 @@ build() { # Replace dynamically-linked mount with statically-linked mount ( - cd $pkg/bin + cd $pkg/usr/bin mv mount.static mount mv umount.static umount ) diff --git a/base/wavpack/wavpack.SMBuild b/base/wavpack/wavpack.SMBuild old mode 100755 new mode 100644 index 89cb11f..1b00c2d --- a/base/wavpack/wavpack.SMBuild +++ b/base/wavpack/wavpack.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/wayland/wayland.SMBuild b/base/wayland/wayland.SMBuild old mode 100755 new mode 100644 index 39a4982..3592fd0 --- a/base/wayland/wayland.SMBuild +++ b/base/wayland/wayland.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-documentation diff --git a/base/which/which.SMBuild b/base/which/which.SMBuild old mode 100755 new mode 100644 index 324cbb9..7663751 --- a/base/which/which.SMBuild +++ b/base/which/which.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/woff2/woff2.SMBuild b/base/woff2/woff2.SMBuild old mode 100755 new mode 100644 index 70af21d..546e0f7 --- a/base/woff2/woff2.SMBuild +++ b/base/woff2/woff2.SMBuild @@ -21,7 +21,6 @@ build() { mkdir -p smbuild && cd smbuild cmake .. -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_BINDIR=/bin \ -DCMAKE_INSTALL_LIBDIR=lib DESTDIR="$pkg" ninja install diff --git a/base/x264/x264.SMBuild b/base/x264/x264.SMBuild old mode 100755 new mode 100644 index 9dbb62e..1e0872e --- a/base/x264/x264.SMBuild +++ b/base/x264/x264.SMBuild @@ -21,7 +21,6 @@ build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared make @@ -34,4 +33,4 @@ build() { sha512sums=" e113a7759528be56c93d2a446ad3b89613f2e3182b03a4631073df3058cc17f5991caf6bd495ebf6602e7ebb515000b871dcd3600e966a91c4ab84f502d26e8f x264-0.164.tar.lz -" \ No newline at end of file +" diff --git a/base/xmlto/xmlto.SMBuild b/base/xmlto/xmlto.SMBuild old mode 100755 new mode 100644 index 42513e2..995dd7d --- a/base/xmlto/xmlto.SMBuild +++ b/base/xmlto/xmlto.SMBuild @@ -21,8 +21,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg @@ -34,4 +33,4 @@ build() { sha512sums=" 991d65dc001d9b0144363ecc4ba57def79c440d80a2106b729484afbe3b4b3a027ae0f0073a6cc283d041fa067dc843c554938afabf1d86964ca7cf33a92cb38 xmlto-0.0.29.tar.lz -" \ No newline at end of file +" diff --git a/base/xz/xz.SMBuild b/base/xz/xz.SMBuild old mode 100755 new mode 100644 index 25354b0..4cea7e6 --- a/base/xz/xz.SMBuild +++ b/base/xz/xz.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --with-pic \ --disable-static \ --disable-nls diff --git a/base/yasm/yasm.SMBuild b/base/yasm/yasm.SMBuild old mode 100755 new mode 100644 index 1e7fcf4..c36a54d --- a/base/yasm/yasm.SMBuild +++ b/base/yasm/yasm.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr sed -i 's@gnu99@gnu99 -fPIC@g' Makefile diff --git a/base/zsh/zsh.SMBuild b/base/zsh/zsh.SMBuild old mode 100755 new mode 100644 index d1682db..7d6d95d --- a/base/zsh/zsh.SMBuild +++ b/base/zsh/zsh.SMBuild @@ -21,7 +21,6 @@ build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-libc-musl make diff --git a/base/zstd/zstd.SMBuild b/base/zstd/zstd.SMBuild old mode 100755 new mode 100644 index b8e503b..4f16b34 --- a/base/zstd/zstd.SMBuild +++ b/base/zstd/zstd.SMBuild @@ -21,7 +21,6 @@ build() { cmake ../build/cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_BINDIR=/bin \ -DCMAKE_INSTALL_LIBDIR=lib \ -DZSTD_ZLIB_SUPPORT=ON \ -DZSTD_LZMA_SUPPORT=ON \