changeset 530:263706a69f92

mate: use new FHS
author David Demelier <markand@malikania.fr>
date Wed, 10 Apr 2019 20:10:00 +0200
parents ef725c40d0e8
children 16d26eee4b33
files mate/libmatekbd/libmatekbd.sh mate/libmatemixer/libmatemixer.sh mate/libmateweather/libmateweather-post.sh mate/libmateweather/libmateweather.sh mate/marco/marco.sh mate/mate-backgrounds/mate-backgrounds.sh mate/mate-calc/mate-calc.sh mate/mate-common/mate-common.sh mate/mate-desktop/mate-desktop.sh mate/mate-icon-theme/mate-icon-theme-post.sh mate/mate-icon-theme/mate-icon-theme.sh mate/mate-menus/mate-menus.sh mate/mate-panel/mate-panel-post.sh mate/mate-panel/mate-panel.sh mate/mate-polkit/mate-polkit.sh mate/mate-session-manager/mate-session-manager-post.sh mate/mate-session-manager/mate-session-manager.sh mate/mate-settings-daemon/mate-settings-daemon-post.sh mate/mate-settings-daemon/mate-settings-daemon.sh mate/mate-terminal/mate-terminal.sh
diffstat 20 files changed, 26 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/mate/libmatekbd/libmatekbd.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/libmatekbd/libmatekbd.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/mate/libmatemixer/libmatemixer.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/libmatemixer/libmatemixer.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -59,15 +59,15 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_alsa \
 		$with_pulseaudio
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libmatemixer.la
-	rm -f $DESTDIR/usr/lib/libmatemixer/*.la
+	rm -f $DESTDIR/lib/libmatemixer.la
+	rm -f $DESTDIR/lib/libmatemixer/*.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/mate/libmateweather/libmateweather-post.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/libmateweather/libmateweather-post.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -15,4 +15,4 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-chroot $DESTDIR /usr/bin/gtk-update-icon-cache -fqt /usr/share/icons/mate
+chroot $DESTDIR /bin/gtk-update-icon-cache -fqt /share/icons/mate
--- a/mate/libmateweather/libmateweather.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/libmateweather/libmateweather.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -46,10 +46,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libmateweather.la
+	rm -f $DESTDIR/lib/libmateweather.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/mate/marco/marco.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/marco/marco.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -57,12 +57,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libmarco-private.la
+	rm -f $DESTDIR/lib/libmarco-private.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-backgrounds/mate-backgrounds.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-backgrounds/mate-backgrounds.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -28,7 +28,7 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
 	pushd $PKGNAME-$PKGVERSION
 
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/mate/mate-calc/mate-calc.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-calc/mate-calc.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -52,7 +52,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/mate/mate-common/mate-common.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-common/mate-common.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/mate/mate-desktop/mate-desktop.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-desktop/mate-desktop.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -52,7 +52,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/mate/mate-icon-theme/mate-icon-theme-post.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-icon-theme/mate-icon-theme-post.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -16,5 +16,5 @@
 #
 
 if [ "$1" = "install" ]; then
-	chroot $DESTDIR /usr/bin/gtk-update-icon-cache -fqt /usr/share/icons/hicolor
+	chroot $DESTDIR /bin/gtk-update-icon-cache -fqt /share/icons/hicolor
 fi
--- a/mate/mate-icon-theme/mate-icon-theme.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-icon-theme/mate-icon-theme.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -29,7 +29,7 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
 	pushd $PKGNAME-$PKGVERSION
 
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/mate/mate-menus/mate-menus.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-menus/mate-menus.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -52,14 +52,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libmate-menu.la
+	rm -f $DESTDIR/lib/libmate-menu.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-panel/mate-panel-post.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-panel/mate-panel-post.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -15,4 +15,4 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-chroot $DESTDIR /usr/bin/gtk-update-icon-cache -fqt /usr/share/icons/hicolor
+chroot $DESTDIR /bin/gtk-update-icon-cache -fqt /share/icons/hicolor
--- a/mate/mate-panel/mate-panel.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-panel/mate-panel.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -69,14 +69,14 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_wayland \
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libmate-panel-applet-4.la
+	rm -f $DESTDIR/lib/libmate-panel-applet-4.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/mate/mate-polkit/mate-polkit.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-polkit/mate-polkit.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/mate/mate-session-manager/mate-session-manager-post.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-session-manager/mate-session-manager-post.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -16,5 +16,5 @@
 #
 
 if [ "$1" = "install" ]; then
-	chroot $DESTDIR /usr/bin/gtk-update-icon-cache -fqt /usr/share/icons/hicolor
+	chroot $DESTDIR /bin/gtk-update-icon-cache -fqt /share/icons/hicolor
 fi
--- a/mate/mate-session-manager/mate-session-manager.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-session-manager/mate-session-manager.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -64,7 +64,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-systemd \
 		$with_ipv6
 	make
--- a/mate/mate-settings-daemon/mate-settings-daemon-post.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-settings-daemon/mate-settings-daemon-post.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -16,5 +16,5 @@
 #
 
 if [ "$1" = "install" ]; then
-	chroot $DESTDIR /usr/bin/gtk-update-icon-cache -fqt /usr/share/icons/hicolor
+	chroot $DESTDIR /bin/gtk-update-icon-cache -fqt /share/icons/hicolor
 fi
--- a/mate/mate-settings-daemon/mate-settings-daemon.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-settings-daemon/mate-settings-daemon.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -77,8 +77,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_audio \
--- a/mate/mate-terminal/mate-terminal.sh	Wed Apr 10 20:05:00 2019 +0200
+++ b/mate/mate-terminal/mate-terminal.sh	Wed Apr 10 20:10:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR