changeset 542:ca639101cecc

xfce: use new FHS
author David Demelier <markand@malikania.fr>
date Wed, 10 Apr 2019 20:31:00 +0200
parents cacbd9d3d3a8
children f555ed22a53b
files xfce/exo/exo.sh xfce/garcon/garcon.sh xfce/gtk-xfce-engine/gtk-xfce-engine.sh xfce/libxfce4ui/libxfce4ui.sh xfce/libxfce4util/libxfce4util.sh xfce/xfce4-panel/xfce4-panel.sh xfce/xfce4-session/xfce4-session.sh xfce/xfce4-settings/xfce4-settings.sh xfce/xfconf/xfconf.sh xfce/xfdesktop/xfdesktop.sh xfce/xfwm4/xfwm4.sh
diffstat 11 files changed, 49 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/xfce/exo/exo.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/exo/exo.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -46,13 +46,13 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--prefix=/usr \
+		--prefix=/ \
 		--sysconfdir=/etc \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libexo-1.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libexo-1.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/garcon/garcon.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/garcon/garcon.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -43,12 +43,11 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libgarcon-gtk2-1.la
-	rm -f $DESTDIR/usr/lib/libgarcon-1.la
+	rm -f $DESTDIR/lib/libgarcon-gtk2-1.la
+	rm -f $DESTDIR/lib/libgarcon-1.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/gtk-xfce-engine/gtk-xfce-engine.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/gtk-xfce-engine/gtk-xfce-engine.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -43,10 +43,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/gtk-2.0/2.10.0/engines/libxfce.la
+	rm -f $DESTDIR/lib/gtk-2.0/2.10.0/engines/libxfce.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/libxfce4ui/libxfce4ui.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/libxfce4ui/libxfce4ui.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -49,15 +49,15 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--prefix=/ \
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libxfce4kbd-private-2.la
-	rm -f $DESTDIR/usr/lib/libxfce4kbd-private-3.la
-	rm -f $DESTDIR/usr/lib/libxfce4ui-1.la
-	rm -f $DESTDIR/usr/lib/libxfce4ui-2.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libxfce4kbd-private-2.la
+	rm -f $DESTDIR/lib/libxfce4kbd-private-3.la
+	rm -f $DESTDIR/lib/libxfce4ui-1.la
+	rm -f $DESTDIR/lib/libxfce4ui-2.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/libxfce4util/libxfce4util.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/libxfce4util/libxfce4util.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -44,12 +44,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--prefix=/ \
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libxfce4util.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libxfce4util.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-panel/xfce4-panel.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/xfce4-panel/xfce4-panel.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -53,15 +53,14 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--enable-gtk3 \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libxfce4panel-*.la
-	rm -f $DESTDIR/usr/lib/xfce4/panel/plugins/*.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libxfce4panel-*.la
+	rm -f $DESTDIR/lib/xfce4/panel/plugins/*.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-session/xfce4-session.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/xfce4-session/xfce4-session.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -67,16 +67,15 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale \
+		--prefix=/ \
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale \
 		$with_policykit \
 		$with_upower
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libxfsm-4.6.la
-	rm -f $DESTDIR/usr/lib/xfce4/session/splash-engines/*.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libxfsm-4.6.la
+	rm -f $DESTDIR/lib/xfce4/session/splash-engines/*.la
 
 
 	popd
--- a/xfce/xfce4-settings/xfce4-settings.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/xfce4-settings/xfce4-settings.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -57,12 +57,11 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--prefix=/ \
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfconf/xfconf.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/xfconf/xfconf.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -46,12 +46,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--prefix=/ \
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libxfconf-0.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libxfconf-0.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfdesktop/xfdesktop.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/xfdesktop/xfdesktop.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -51,9 +51,9 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--localedir=/usr/share/locale \
-		--with-locales-dir=/usr/share/locale
+		--prefix=/ \
+		--localedir=/share/locale \
+		--with-locales-dir=/share/locale
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/xfce/xfwm4/xfwm4.sh	Wed Apr 10 20:30:00 2019 +0200
+++ b/xfce/xfwm4/xfwm4.sh	Wed Apr 10 20:31:00 2019 +0200
@@ -57,9 +57,9 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION