diff --git a/xfce/exo/smbuild b/xfce/exo/smbuild index 29a4fe4..b095df4 100644 --- a/xfce/exo/smbuild +++ b/xfce/exo/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/faenza-icon-theme/smbuild b/xfce/faenza-icon-theme/smbuild index 1ca3074..9dad52a 100644 --- a/xfce/faenza-icon-theme/smbuild +++ b/xfce/faenza-icon-theme/smbuild @@ -17,9 +17,9 @@ prepbuilddir() { } build() { - mkdir -p $pkg/share/icons - cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $pkg/share/icons/ - cp -r emesene $pkg/share/ + mkdir -p $pkg/usr/share/icons + cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $pkg/usr/share/icons/ + cp -r emesene $pkg/usr/share/ cp debian/copyright $pkgdocs/ diff --git a/xfce/garcon/smbuild b/xfce/garcon/smbuild index 612a35c..ff9c19a 100644 --- a/xfce/garcon/smbuild +++ b/xfce/garcon/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static make diff --git a/xfce/libxfce4ui/smbuild b/xfce/libxfce4ui/smbuild index e41517e..a19e25a 100644 --- a/xfce/libxfce4ui/smbuild +++ b/xfce/libxfce4ui/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static make diff --git a/xfce/libxfce4util/smbuild b/xfce/libxfce4util/smbuild index 5756002..d6ddfac 100644 --- a/xfce/libxfce4util/smbuild +++ b/xfce/libxfce4util/smbuild @@ -18,8 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --sbindir=/bin \ + --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static make diff --git a/xfce/mousepad/smbuild b/xfce/mousepad/smbuild index 4c6f876..8cdc729 100644 --- a/xfce/mousepad/smbuild +++ b/xfce/mousepad/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/ristretto/smbuild b/xfce/ristretto/smbuild index 30ff5a9..7ec4ce9 100644 --- a/xfce/ristretto/smbuild +++ b/xfce/ristretto/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/thunar-archive-plugin/smbuild b/xfce/thunar-archive-plugin/smbuild index 594ca64..167b06c 100644 --- a/xfce/thunar-archive-plugin/smbuild +++ b/xfce/thunar-archive-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static \ make diff --git a/xfce/thunar-volman/smbuild b/xfce/thunar-volman/smbuild index 9a81038..0382fa8 100644 --- a/xfce/thunar-volman/smbuild +++ b/xfce/thunar-volman/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/thunar/smbuild b/xfce/thunar/smbuild index 1539a30..d4d21d1 100644 --- a/xfce/thunar/smbuild +++ b/xfce/thunar/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --enable-gio-unix \ --enable-gudev \ --enable-exif \ diff --git a/xfce/tumbler/smbuild b/xfce/tumbler/smbuild index b652667..418ae9c 100644 --- a/xfce/tumbler/smbuild +++ b/xfce/tumbler/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static make diff --git a/xfce/upower/smbuild b/xfce/upower/smbuild index 5a5e0b4..1f9c1fd 100644 --- a/xfce/upower/smbuild +++ b/xfce/upower/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static make diff --git a/xfce/vte5/smbuild b/xfce/vte5/smbuild index 0cb56ae..2c34971 100644 --- a/xfce/vte5/smbuild +++ b/xfce/vte5/smbuild @@ -22,7 +22,7 @@ build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/usr \ -D_systemd=false ninja diff --git a/xfce/xfce4-appfinder/smbuild b/xfce/xfce4-appfinder/smbuild index dc77ed0..849f9f3 100644 --- a/xfce/xfce4-appfinder/smbuild +++ b/xfce/xfce4-appfinder/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-cpugraph-plugin/smbuild b/xfce/xfce4-cpugraph-plugin/smbuild index aa55bc4..fe17a24 100644 --- a/xfce/xfce4-cpugraph-plugin/smbuild +++ b/xfce/xfce4-cpugraph-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-datetime-plugin/smbuild b/xfce/xfce4-datetime-plugin/smbuild index afc5027..08806e0 100644 --- a/xfce/xfce4-datetime-plugin/smbuild +++ b/xfce/xfce4-datetime-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-dev-tools/smbuild b/xfce/xfce4-dev-tools/smbuild index 6681131..5d9e836 100644 --- a/xfce/xfce4-dev-tools/smbuild +++ b/xfce/xfce4-dev-tools/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-dict/smbuild b/xfce/xfce4-dict/smbuild index af27789..8b662fd 100644 --- a/xfce/xfce4-dict/smbuild +++ b/xfce/xfce4-dict/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/xfce4-diskperf-plugin/smbuild b/xfce/xfce4-diskperf-plugin/smbuild index fe3d1cf..b96decf 100644 --- a/xfce/xfce4-diskperf-plugin/smbuild +++ b/xfce/xfce4-diskperf-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-fsguard-plugin/smbuild b/xfce/xfce4-fsguard-plugin/smbuild index 0bd0f19..312b4cd 100644 --- a/xfce/xfce4-fsguard-plugin/smbuild +++ b/xfce/xfce4-fsguard-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/xfce4-netload-plugin/smbuild b/xfce/xfce4-netload-plugin/smbuild index 7551168..bd3dae3 100644 --- a/xfce/xfce4-netload-plugin/smbuild +++ b/xfce/xfce4-netload-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/xfce4-notifyd/smbuild b/xfce/xfce4-notifyd/smbuild index 1b27cdf..0fc257e 100644 --- a/xfce/xfce4-notifyd/smbuild +++ b/xfce/xfce4-notifyd/smbuild @@ -20,7 +20,8 @@ build() { sed -e "s/^systemd_user_in_files =.*/systemd_user_in_files =/" -i Makefile.in ./configure \ - --prefix="" + --prefix=/usr \ + --sysconfdir=/etc make make install DESTDIR=$pkg diff --git a/xfce/xfce4-panel/smbuild b/xfce/xfce4-panel/smbuild index 07bae31..bc85d5a 100644 --- a/xfce/xfce4-panel/smbuild +++ b/xfce/xfce4-panel/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static make @@ -31,4 +32,4 @@ build() { sha512sums=" 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d xfce4-panel-4.16.2.tar.bz2 -" \ No newline at end of file +" diff --git a/xfce/xfce4-power-manager/smbuild b/xfce/xfce4-power-manager/smbuild index d8e977c..eaa08c2 100644 --- a/xfce/xfce4-power-manager/smbuild +++ b/xfce/xfce4-power-manager/smbuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-polkit \ --disable-network-manager diff --git a/xfce/xfce4-screenshooter/smbuild b/xfce/xfce4-screenshooter/smbuild index ee742df..1644a65 100644 --- a/xfce/xfce4-screenshooter/smbuild +++ b/xfce/xfce4-screenshooter/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-sensors-plugin/smbuild b/xfce/xfce4-sensors-plugin/smbuild index 2d63ed6..4860c98 100644 --- a/xfce/xfce4-sensors-plugin/smbuild +++ b/xfce/xfce4-sensors-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/xfce4-session/smbuild b/xfce/xfce4-session/smbuild index 488ed92..94b8c6e 100644 --- a/xfce/xfce4-session/smbuild +++ b/xfce/xfce4-session/smbuild @@ -18,13 +18,14 @@ prepbuilddir() { build() { ./configure \ - --prefix="/" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static \ --disable-polkit \ --disable-legacy-sm make - make install XSESSION_PREFIX="/" DESTDIR=$pkg + make install DESTDIR=$pkg mkfinalpkg } diff --git a/xfce/xfce4-settings/smbuild b/xfce/xfce4-settings/smbuild index ecf376d..20bba7c 100644 --- a/xfce/xfce4-settings/smbuild +++ b/xfce/xfce4-settings/smbuild @@ -20,7 +20,8 @@ build() { applypatch $srcdir/default-xsettings-xml.patch ./configure \ - --prefix="" \ + --prefix=/usr \ + --sysconfdir=/etc \ --disable-static \ --enable-sound-settings \ --enable-pluggable-dialogs \ diff --git a/xfce/xfce4-systemload-plugin/smbuild b/xfce/xfce4-systemload-plugin/smbuild index 33d7513..c3d580a 100644 --- a/xfce/xfce4-systemload-plugin/smbuild +++ b/xfce/xfce4-systemload-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-taskmanager/smbuild b/xfce/xfce4-taskmanager/smbuild index f482bbe..e2e9af8 100644 --- a/xfce/xfce4-taskmanager/smbuild +++ b/xfce/xfce4-taskmanager/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/xfce4-terminal/smbuild b/xfce/xfce4-terminal/smbuild index e86c094..78ded4e 100644 --- a/xfce/xfce4-terminal/smbuild +++ b/xfce/xfce4-terminal/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix=/usr make make install DESTDIR=$pkg diff --git a/xfce/xfce4-wavelan-plugin/smbuild b/xfce/xfce4-wavelan-plugin/smbuild index 73a8699..49a0c16 100644 --- a/xfce/xfce4-wavelan-plugin/smbuild +++ b/xfce/xfce4-wavelan-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-weather-plugin/smbuild b/xfce/xfce4-weather-plugin/smbuild index 844a401..1b796cd 100644 --- a/xfce/xfce4-weather-plugin/smbuild +++ b/xfce/xfce4-weather-plugin/smbuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfce4-whiskermenu-plugin/smbuild b/xfce/xfce4-whiskermenu-plugin/smbuild index c5cfb70..9df078c 100644 --- a/xfce/xfce4-whiskermenu-plugin/smbuild +++ b/xfce/xfce4-whiskermenu-plugin/smbuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib make diff --git a/xfce/xfconf/smbuild b/xfce/xfconf/smbuild index 63f68e1..7947a18 100644 --- a/xfce/xfconf/smbuild +++ b/xfce/xfconf/smbuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static make diff --git a/xfce/xfdesktop/smbuild b/xfce/xfdesktop/smbuild index c2a9f1a..f4f64a1 100644 --- a/xfce/xfdesktop/smbuild +++ b/xfce/xfdesktop/smbuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix=/usr \ --enable-thunarx \ --enable-notifications diff --git a/xfce/xfwm4-themes/smbuild b/xfce/xfwm4-themes/smbuild index e3f20a1..151ea82 100644 --- a/xfce/xfwm4-themes/smbuild +++ b/xfce/xfwm4-themes/smbuild @@ -19,8 +19,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --libexecdir=/lib + --prefix=/usr \ + --libexecdir=/usr/libexec make make install DESTDIR=$pkg diff --git a/xfce/xfwm4/smbuild b/xfce/xfwm4/smbuild index f33f9c6..abb5f52 100644 --- a/xfce/xfwm4/smbuild +++ b/xfce/xfwm4/smbuild @@ -17,21 +17,12 @@ prepbuilddir() { } build() { - - # Results in faster window draw and less CPU on the pi - if [ "$aarch" = "aarch64" ]; then - compositingflag="--disable-compositor" - else - compositingflag="--enable-compositor" - fi - ./configure \ - --prefix="" \ + --prefix=/usr \ --disable-static \ --enable-startup-notification \ --enable-randr \ - --enable-xsync \ - $compositingflag + --enable-xsync make make install DESTDIR=$pkg