Mercurial > vanilla

changeset 519:824fb5352478

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
desktop: use new FHS
author David Demelier <markand@malikania.fr>
date Tue, 09 Apr 2019 19:45:38 +0200
parents 924f166e82d7
children c6c29dc90899
files desktop/dconf/dconf.sh desktop/icon-naming-utils/icon-naming-utils.sh desktop/libnotify/libnotify.sh desktop/libwnck/libwnck.sh desktop/libwnck2/libwnck2.sh desktop/startup-notification/startup-notification.sh desktop/zenity/zenity.sh
diffstat 7 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/desktop/dconf/dconf.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/dconf/dconf.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -40,7 +40,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D man=false \
--- a/desktop/icon-naming-utils/icon-naming-utils.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/icon-naming-utils/icon-naming-utils.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -29,9 +29,9 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
 	pushd $PKGNAME-$PKGVERSION
 
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
-	make install DESTDIR=$DESTDIR pkgconfigdir=/usr/lib/pkgconfig
+	make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/libnotify/libnotify.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/libnotify/libnotify.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -45,7 +45,7 @@
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D introspection=enabled \
--- a/desktop/libwnck/libwnck.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/libwnck/libwnck.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -44,10 +44,10 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libwnck-3.la
+	rm -f $DESTDIR/lib/libwnck-3.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/libwnck2/libwnck2.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/libwnck2/libwnck2.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -44,13 +44,13 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
-		--localedir=/usr/share/locale
+		--localedir=/share/locale
 	make
-	make install DESTDIR=$DESTDIR itlocaledir=/usr/share/locale
-	rm -f $DESTDIR/usr/lib/libwnck-1.la
+	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
+	rm -f $DESTDIR/lib/libwnck-1.la
 
 	popd
 	rm -rf libwnck-$PKGVERSION
--- a/desktop/startup-notification/startup-notification.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/startup-notification/startup-notification.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -39,12 +39,12 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libstartup-notification-1.la
+	rm -f $DESTDIR/lib/libstartup-notification-1.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/zenity/zenity.sh	Tue Apr 09 19:42:34 2019 +0200
+++ b/desktop/zenity/zenity.sh	Tue Apr 09 19:45:38 2019 +0200
@@ -52,7 +52,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--enable-libnotify \
 		$with_webkit
 	make