commit 56948d1

repo/: remove leftover /usr

1@@ -7,7 +7,7 @@ sed "/subdir('tests')/d" tls/meson.build > _
2 mv -f _ tls/meson.build
3 
4 meson setup \
5-    -Dprefix=/usr \
6+    -Dprefix=/ \
7     -Dsysconfdir=/etc \
8     -Dlocalstatedir=/var \
9     -Dlibproxy=disabled \

 1@@ -17,20 +17,20 @@ TMPDIR="$1/tmp"
 2 make
 3 make install
 4 
 5-# Some X11 packages install to /usr/share.
 6-! [ -d "$1/usr/share/pkgconfig" ] || {
 7-    mkdir -p "$1/usr/lib"
 8-    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
 9+# Some X11 packages install to /share.
10+! [ -d "$1/share/pkgconfig" ] || {
11+    mkdir -p "$1/lib"
12+    mv -f "$1/share/pkgconfig" "$1/lib"
13 }
14 
15 # We need to keep this around.
16-! [ -d "$1/usr/share/aclocal" ] || {
17+! [ -d "$1/share/aclocal" ] || {
18     mkdir -p "$TMPDIR"
19-    mv -f "$1/usr/share/aclocal" "$TMPDIR"
20+    mv -f "$1/share/aclocal" "$TMPDIR"
21 }
22 
23 # Restore kept directories.
24 ! [ -d "$TMPDIR" ] || {
25-    mv -f "$TMPDIR/"* "$1/usr/share"
26+    mv -f "$TMPDIR/"* "$1/share"
27     rm -rf "$TMPDIR"
28 }

1@@ -8,7 +8,7 @@ export DESTDIR="$1"
2 meson setup \
3     -Dprefix=/ \
4     -Dsysconfdir=/etc \
5-    -Dmandir=/usr/share/man \
6+    -Dmandir=/share/man \
7     -Dpkg_config_path=/lib/pkgconfig \
8     -Dx11=true \
9     output

1@@ -4,7 +4,7 @@ export DESTDIR="$1"
2 
3 meson setup \
4     -Dprefix=/ \
5-    -Dlibexecdir=/usr/lib \
6+    -Dlibexecdir=/lib \
7     -Ddefault_library=static \
8     -Denable-docs=false \
9     -Denable-wayland=false \