changeset 520:c6c29dc90899

dev: use new FHS
author David Demelier <markand@malikania.fr>
date Tue, 09 Apr 2019 19:49:25 +0200
parents 824fb5352478
children 13ff869bfbb8
files dev/autoconf-archive/autoconf-archive.sh dev/autoconf/autoconf.sh dev/autoconf213/autoconf213.sh dev/automake/automake.sh dev/binutils/binutils.sh dev/bison/bison.sh dev/clang/clang.sh dev/cmake/cmake.sh dev/diffstat/diffstat.sh dev/flex/flex.sh dev/gcc/gcc.sh dev/gobject-introspection/gobject-introspection.sh dev/gperf/gperf.sh dev/gtk-doc/gtk-doc.sh dev/help2man/help2man.sh dev/intltool/intltool.sh dev/libtool/libtool.sh dev/lld/lld.sh dev/lldb/lldb.sh dev/llvm/llvm.sh dev/m4/m4.sh dev/mercurial/mercurial.sh dev/nasm/nasm.sh dev/ninja/ninja.sh dev/patch/patch.sh dev/pkgconf/pkgconf.sh dev/swig/swig.sh dev/tcl/tcl.sh dev/vala/vala.sh
diffstat 29 files changed, 51 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/dev/autoconf-archive/autoconf-archive.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/autoconf-archive/autoconf-archive.sh	Tue Apr 09 19:49:25 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/dev/autoconf/autoconf.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/autoconf/autoconf.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -38,7 +38,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/autoconf213/autoconf213.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/autoconf213/autoconf213.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -33,7 +33,7 @@
 	patch -p1 < ../autoconf.patch
 	mv autoconf.texi autoconf213.texi 
 	rm autoconf.info
-	./configure --prefix=/usr --program-suffix=-2.13
+	./configure --prefix=/ --program-suffix=-2.13
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/automake/automake.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/automake/automake.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/binutils/binutils.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/binutils/binutils.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -64,7 +64,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-werror \
 		--enable-gold \
 		--enable-ld=default \
@@ -77,11 +77,10 @@
 		--with-system-zlib \
 		$with_nls \
 		$with_gdb
-	make tooldir=/usr
-	make tooldir=/usr install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libbfd.la
-	rm -f $DESTDIR/usr/lib/libopcodes.la
-
+	make tooldir=/
+	make tooldir=/ install DESTDIR=$DESTDIR
+	rm -f $DESTDIR/lib/libbfd.la
+	rm -f $DESTDIR/lib/libopcodes.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/dev/bison/bison.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/bison/bison.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -58,7 +58,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/dev/clang/clang.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/clang/clang.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -67,7 +67,7 @@
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_PREFIX=/ \
 		-DCLANG_VENDOR="Vanilla Linux" \
 		-DLLVM_ENABLE_EH=On \
 		-DLLVM_ENABLE_RTTI=On \
--- a/dev/cmake/cmake.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/cmake/cmake.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -46,8 +46,8 @@
 	pushd $PKGNAME-$PKGVERSION
 
 	./configure \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/cmake \
+		--prefix=/ \
+		--docdir=/share/doc/cmake \
 		--system-libs \
 		$with_qt
 	make
--- a/dev/diffstat/diffstat.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/diffstat/diffstat.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/flex/flex.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/flex/flex.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -46,12 +46,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libfl.la
+	rm -f $DESTDIR/lib/libfl.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/dev/gcc/gcc.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/gcc/gcc.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -63,11 +63,11 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		--enable-languages=c,c++ \
 		--enable-threads=posix \
 		--enable-__cxa_atexit \
-		--libdir=/usr/lib \
+		--libdir=/lib \
 		--with-system-zlib \
 		--enable-shared \
 		--enable-tls \
--- a/dev/gobject-introspection/gobject-introspection.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/gobject-introspection/gobject-introspection.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -37,7 +37,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		. build
--- a/dev/gperf/gperf.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/gperf/gperf.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/gtk-doc/gtk-doc.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/gtk-doc/gtk-doc.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -43,9 +43,9 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
-	make install DESTDIR=$DESTDIR pkgconfigdir=/usr/lib/pkgconfig
+	make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/dev/help2man/help2man.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/help2man/help2man.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -53,7 +53,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/dev/intltool/intltool.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/intltool/intltool.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/libtool/libtool.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/libtool/libtool.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,12 +42,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--enable-shared \
 		--disable-static
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libltdl.la
+	rm -f $DESTDIR/lib/libltdl.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/dev/lld/lld.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/lld/lld.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -41,7 +41,7 @@
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_PREFIX=/ \
 		-GNinja
 	ninja
 	DESTDIR=$DESTDIR ninja install
--- a/dev/lldb/lldb.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/lldb/lldb.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -41,7 +41,7 @@
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_PREFIX=/ \
 		-DLLVM_ENABLE_EH=On \
 		-DLLVM_ENABLE_RTTI=On \
 		-GNinja
--- a/dev/llvm/llvm.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/llvm/llvm.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -70,7 +70,7 @@
 	mkdir build && pushd build
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_PREFIX=/ \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DCMAKE_CXX_COMPILER="$CXX" \
--- a/dev/m4/m4.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/m4/m4.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/mercurial/mercurial.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/mercurial/mercurial.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -34,12 +34,12 @@
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
-	make PYTHON=python2 PREFIX=/usr all
-	make PYTHON=python2 PREFIX=/usr DESTDIR=$DESTDIR install
-	install -Dm0755 contrib/hg-ssh $DESTDIR/usr/bin/hg-ssh
-	install -Dm0755 contrib/hgk $DESTDIR/usr/libexec/mercurial/hgk
-	install -Dm0644 contrib/zsh_completion $DESTDIR/usr/share/zsh/site-functions/_$PKGNAME
-	install -Dm0644 contrib/bash_completion $DESTDIR/usr/share/bash-completion/completions/$PKGNAME
+	make PYTHON=python2 PREFIX=/ all
+	make PYTHON=python2 PREFIX=/ DESTDIR=$DESTDIR install
+	install -Dm0755 contrib/hg-ssh $DESTDIR/bin/hg-ssh
+	install -Dm0755 contrib/hgk $DESTDIR/libexec/mercurial/hgk
+	install -Dm0644 contrib/zsh_completion $DESTDIR/share/zsh/site-functions/_$PKGNAME
+	install -Dm0644 contrib/bash_completion $DESTDIR/share/bash-completion/completions/$PKGNAME
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/dev/nasm/nasm.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/nasm/nasm.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/ninja/ninja.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/ninja/ninja.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -31,7 +31,7 @@
 	# https://git.alpinelinux.org/aports/tree/main/ninja
 	patch -p1 < ../musl.patch
 	python3 ./configure.py --bootstrap
-	install -Dm0755 ninja $DESTDIR/usr/bin/ninja
+	install -Dm0755 ninja $DESTDIR/bin/ninja
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/dev/patch/patch.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/patch/patch.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/dev/pkgconf/pkgconf.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/pkgconf/pkgconf.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -43,14 +43,14 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libpkgconf.la
-	ln -sf pkgconf $DESTDIR/usr/bin/pkg-config
+	rm -f $DESTDIR/lib/libpkgconf.la
+	ln -sf pkgconf $DESTDIR/bin/pkg-config
 
 	popd
 	rm -rf $PKGNAME
--- a/dev/swig/swig.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/swig/swig.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -55,7 +55,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_pcre
 	make
 	make install DESTDIR=$DESTDIR
--- a/dev/tcl/tcl.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/tcl/tcl.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -43,14 +43,14 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
+		--prefix=/ \
+		--mandir=/share/man \
 		--disable-static \
 		--enable-shared \
 		--enable-64bit
 	make
 	make install DESTDIR=$DESTDIR
-	ln -sf $DESTDIR/usr/bin/tclsh8 $DESTDIR/usr/bin/tclsh
+	ln -sf $DESTDIR/bin/tclsh8 $DESTDIR/bin/tclsh
 
 	popd
 	rm -rf ${PKGNAME}${PKGVERSION}
--- a/dev/vala/vala.sh	Tue Apr 09 19:45:38 2019 +0200
+++ b/dev/vala/vala.sh	Tue Apr 09 19:49:25 2019 +0200
@@ -44,15 +44,15 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libvala*.la
-	rm -f $DESTDIR/usr/lib/libvaladoc*.la
-	rm -f $DESTDIR/usr/lib/vala-*/*.la
-	rm -f $DESTDIR/usr/lib/valadoc/doclets/*/*.la
+	rm -f $DESTDIR/lib/libvala*.la
+	rm -f $DESTDIR/lib/libvaladoc*.la
+	rm -f $DESTDIR/lib/vala-*/*.la
+	rm -f $DESTDIR/lib/valadoc/doclets/*/*.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION