From 0574064e651490abe64a0e33d9ab3b4809197e4a Mon Sep 17 00:00:00 2001 From: PktSurf Date: Mon, 12 Jun 2023 21:56:31 +0530 Subject: [PATCH] Changed prefix build option in several extra package build files --- extra/abiword/abiword.SMBuild | 2 +- extra/adafruit-io/adafruit-io.SMBuild | 2 +- extra/blueman/blueman.SMBuild | 2 +- extra/bluez/bluez.SMBuild | 2 +- extra/cmatrix/cmatrix.SMBuild | 2 +- extra/dia/dia.SMBuild | 2 +- extra/dmenu/dmenu.SMBuild | 2 +- extra/dwm/dwm.SMBuild | 2 +- extra/feh/feh.SMBuild | 4 ++-- extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild | 2 +- extra/florence/florence.SMBuild | 2 +- extra/gnumeric/gnumeric.SMBuild | 2 +- extra/gthumb/gthumb.SMBuild | 2 +- extra/gtypist/gtypist.SMBuild | 2 +- extra/iotop/iotop.SMBuild | 2 +- extra/mtd-utils/mtd-utils.SMBuild | 2 +- extra/mupdf/mupdf.SMBuild | 4 ++-- extra/scrcpy/scrcpy.SMBuild | 2 +- extra/slock/slock.SMBuild | 2 +- extra/testdisk/testdisk.SMBuild | 2 +- extra/tmux/tmux.SMBuild | 2 +- extra/v4l-utils/v4l-utils.SMBuild | 2 +- extra/vim/vim.SMBuild | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/extra/abiword/abiword.SMBuild b/extra/abiword/abiword.SMBuild index 4b54709..a554994 100755 --- a/extra/abiword/abiword.SMBuild +++ b/extra/abiword/abiword.SMBuild @@ -29,7 +29,7 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ xslfo" ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-static \ --enable-plugins="$_plugins" diff --git a/extra/adafruit-io/adafruit-io.SMBuild b/extra/adafruit-io/adafruit-io.SMBuild index a64413d..8563f75 100755 --- a/extra/adafruit-io/adafruit-io.SMBuild +++ b/extra/adafruit-io/adafruit-io.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE* $pkgdocs/ diff --git a/extra/blueman/blueman.SMBuild b/extra/blueman/blueman.SMBuild index b8c0863..ff16d2d 100755 --- a/extra/blueman/blueman.SMBuild +++ b/extra/blueman/blueman.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ diff --git a/extra/bluez/bluez.SMBuild b/extra/bluez/bluez.SMBuild index a1f3e0c..b7b9d9d 100755 --- a/extra/bluez/bluez.SMBuild +++ b/extra/bluez/bluez.SMBuild @@ -24,7 +24,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --sysconfdir=/etc \ --libexecdir=/lib \ diff --git a/extra/cmatrix/cmatrix.SMBuild b/extra/cmatrix/cmatrix.SMBuild index 7f946da..d9a0b6b 100755 --- a/extra/cmatrix/cmatrix.SMBuild +++ b/extra/cmatrix/cmatrix.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/extra/dia/dia.SMBuild b/extra/dia/dia.SMBuild index ccddb50..1e07965 100755 --- a/extra/dia/dia.SMBuild +++ b/extra/dia/dia.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --with-cairo \ --disable-gnome \ --with-hardbooks=no diff --git a/extra/dmenu/dmenu.SMBuild b/extra/dmenu/dmenu.SMBuild index 1352801..1ba7ee5 100755 --- a/extra/dmenu/dmenu.SMBuild +++ b/extra/dmenu/dmenu.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg + make install PREFIX=/ MANPREFIX=/share/man DESTDIR=$pkg cp LICENSE $pkgdocs/ diff --git a/extra/dwm/dwm.SMBuild b/extra/dwm/dwm.SMBuild index ecc87af..3d5a7dc 100755 --- a/extra/dwm/dwm.SMBuild +++ b/extra/dwm/dwm.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { make - make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg + make install PREFIX=/ MANPREFIX=/share/man DESTDIR=$pkg cp LICENSE $pkgdocs/ diff --git a/extra/feh/feh.SMBuild b/extra/feh/feh.SMBuild index 47073a3..a702a0f 100755 --- a/extra/feh/feh.SMBuild +++ b/extra/feh/feh.SMBuild @@ -17,9 +17,9 @@ prepbuilddir() { } build() { - CFLAGS+=" -include string.h" make PREFIX="/" exif=1 help=1 + CFLAGS+=" -include string.h" make PREFIX=/ exif=1 help=1 make install DESTDIR=$pkg \ - PREFIX="/" \ + PREFIX=/ \ man_dir=$pkg/share/man \ example_dir="$pkg/share/doc/$app-$version/examples" \ doc_dir="$pkg/share/doc/$app-$version" diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild b/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild index a73fcd9..fb5ef46 100755 --- a/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild +++ b/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=/include \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/florence/florence.SMBuild b/extra/florence/florence.SMBuild index c099fd8..c7423c3 100755 --- a/extra/florence/florence.SMBuild +++ b/extra/florence/florence.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --without-docs \ --disable-static diff --git a/extra/gnumeric/gnumeric.SMBuild b/extra/gnumeric/gnumeric.SMBuild index e47a71f..8eed2d4 100755 --- a/extra/gnumeric/gnumeric.SMBuild +++ b/extra/gnumeric/gnumeric.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="/" \ + --prefix=/ \ --disable-introspection make diff --git a/extra/gthumb/gthumb.SMBuild b/extra/gthumb/gthumb.SMBuild index fa23045..2f1ce72 100755 --- a/extra/gthumb/gthumb.SMBuild +++ b/extra/gthumb/gthumb.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" + --prefix=/ ninja DESTDIR="$pkg" ninja install diff --git a/extra/gtypist/gtypist.SMBuild b/extra/gtypist/gtypist.SMBuild index b17b436..27e78cc 100755 --- a/extra/gtypist/gtypist.SMBuild +++ b/extra/gtypist/gtypist.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { LDFLAGS="-lterminfo -lncurses" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/extra/iotop/iotop.SMBuild b/extra/iotop/iotop.SMBuild index 173226f..034f124 100755 --- a/extra/iotop/iotop.SMBuild +++ b/extra/iotop/iotop.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { python3 setup.py build - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp COPYING $pkgdocs/ diff --git a/extra/mtd-utils/mtd-utils.SMBuild b/extra/mtd-utils/mtd-utils.SMBuild index d89cd96..4bd85c3 100755 --- a/extra/mtd-utils/mtd-utils.SMBuild +++ b/extra/mtd-utils/mtd-utils.SMBuild @@ -25,7 +25,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --without-zstd diff --git a/extra/mupdf/mupdf.SMBuild b/extra/mupdf/mupdf.SMBuild index d1b737b..5408dea 100755 --- a/extra/mupdf/mupdf.SMBuild +++ b/extra/mupdf/mupdf.SMBuild @@ -26,9 +26,9 @@ build() { rm -rf thirdparty/"$library" done - make USE_SYSTEM_LIBS=yes prefix="/" CURL_LIBS="-lcurl -lpthread" \ + make USE_SYSTEM_LIBS=yes prefix=/ CURL_LIBS="-lcurl -lpthread" \ build=release libs apps - make USE_SYSTEM_LIBS=yes prefix="/" DESTDIR="$pkg" install + make USE_SYSTEM_LIBS=yes prefix=/ DESTDIR="$pkg" install # .desktop taken from debian and modified: install -Dm 644 $srcdir/$app.desktop $pkg/share/applications/$app.desktop diff --git a/extra/scrcpy/scrcpy.SMBuild b/extra/scrcpy/scrcpy.SMBuild index 6bc2591..4555463 100755 --- a/extra/scrcpy/scrcpy.SMBuild +++ b/extra/scrcpy/scrcpy.SMBuild @@ -20,7 +20,7 @@ build() { mkdir -p build/server && cd build cp $srcdir/scrcpy-server-v"$version".zip server/scrcpy-server meson .. \ - --prefix="/" \ + --prefix=/ \ --buildtype release ninja diff --git a/extra/slock/slock.SMBuild b/extra/slock/slock.SMBuild index a800b78..b6a4b35 100755 --- a/extra/slock/slock.SMBuild +++ b/extra/slock/slock.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { make - make install PREFIX="/" DESTDIR=$pkg + make install PREFIX=/ DESTDIR=$pkg cp LICENSE $pkgdocs/ diff --git a/extra/testdisk/testdisk.SMBuild b/extra/testdisk/testdisk.SMBuild index 962b03a..8122a28 100755 --- a/extra/testdisk/testdisk.SMBuild +++ b/extra/testdisk/testdisk.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { LIBS="-lncurses -lterminfo" \ ./configure \ - --prefix="" \ + --prefix= \ make make install DESTDIR=$pkg diff --git a/extra/tmux/tmux.SMBuild b/extra/tmux/tmux.SMBuild index 9fb09a9..1c8cca6 100755 --- a/extra/tmux/tmux.SMBuild +++ b/extra/tmux/tmux.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/extra/v4l-utils/v4l-utils.SMBuild b/extra/v4l-utils/v4l-utils.SMBuild index b1c35ca..95575a1 100755 --- a/extra/v4l-utils/v4l-utils.SMBuild +++ b/extra/v4l-utils/v4l-utils.SMBuild @@ -23,7 +23,7 @@ build() { CFLAGS+=" -D__off_t=off_t" \ LIBS="-largp" \ ./configure \ - --prefix="/" \ + --prefix=/ \ --sbindir=/bin \ --disable-static diff --git a/extra/vim/vim.SMBuild b/extra/vim/vim.SMBuild index af83481..e5ae072 100755 --- a/extra/vim/vim.SMBuild +++ b/extra/vim/vim.SMBuild @@ -21,7 +21,7 @@ build() { LIBS="-lcurses -lterminfo" \ LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --sysconfdir=/etc \ --disable-netbeans --disable-gui \ --with-x=no --enable-multibyte --with-features=normal \