Mercurial > vanilla

changeset 515:030ebf8e0a69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: update templates for our custom FHS
author David Demelier <markand@malikania.fr>
date Tue, 09 Apr 2019 20:20:00 +0200
parents 33e57b5ed4a8
children 014d018468fb
files Templates/autotools.sh Templates/cmake.sh Templates/gdk-pixbuf-post.sh Templates/gtk-update-icon-cache-post.sh Templates/mate.sh Templates/meson.sh Templates/rc Templates/shell-post.sh Templates/xfce.sh
diffstat 9 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Templates/autotools.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/autotools.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -48,7 +48,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/Templates/cmake.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/cmake.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -43,7 +43,7 @@
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/
 	make
 	make install DESTDIR=$DESTDIR
 	popd
--- a/Templates/gdk-pixbuf-post.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/gdk-pixbuf-post.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -15,4 +15,4 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-chroot $DESTDIR /usr/bin/gdk-pixbuf-query-loaders --update-cache
+chroot $DESTDIR /bin/gdk-pixbuf-query-loaders --update-cache
--- a/Templates/gtk-update-icon-cache-post.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/gtk-update-icon-cache-post.sh	Tue Apr 09 20:20: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/DIRECTORY
+chroot $DESTDIR /bin/gtk-update-icon-cache -fqt /share/icons/DIRECTORY
--- a/Templates/mate.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/mate.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -44,7 +44,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/Templates/meson.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/meson.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -42,7 +42,7 @@
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		. build
--- a/Templates/rc	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/rc	Tue Apr 09 20:20:00 2019 +0200
@@ -6,7 +6,7 @@
 	. /etc/rc.conf
 fi
 
-: ${TEMPLATE_CMD:=/usr/sbin/template}
+: ${TEMPLATE_CMD:=/bin/template}
 : ${TEMPLATE_ARGS:=--foo}
 : ${TEMPLATE_PID:=/var/run/template/template.pid}
 
--- a/Templates/shell-post.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/shell-post.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -16,9 +16,9 @@
 #
 
 if [ "$1" = "install" ]; then
-	if ! grep -q "/usr/bin/SHELL" $DESTDIR/etc/shells >/dev/null 2>&1; then
-		echo "/usr/bin/SHELL" >> $DESTDIR/etc/shells
+	if ! grep -q "/bin/SHELL" $DESTDIR/etc/shells >/dev/null 2>&1; then
+		echo "/bin/SHELL" >> $DESTDIR/etc/shells
 	fi
 elif [ "$1" = "uninstall" ]; then
-	sed -i -e '/\/usr\/bin\/SHELL/d' $DESTDIR/etc/shells
+	sed -i -e '/\/bin\/SHELL/d' $DESTDIR/etc/shells
 fi
--- a/Templates/xfce.sh	Tue Apr 09 20:15:00 2019 +0200
+++ b/Templates/xfce.sh	Tue Apr 09 20:20:00 2019 +0200
@@ -44,7 +44,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR