Skip to content

Commit 37557a9

Browse files
committed
arch/optenv32.sh: define yet more share/etc default paths
We will handle all data files with symlinks unless they must be kept as unique copies.
1 parent 046d683 commit 37557a9

File tree

1 file changed

+31
-1
lines changed

1 file changed

+31
-1
lines changed

arch/optenv32.sh

+31-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
PREFIX="/opt/32"
66
BINDIR="/opt/32/bin"
77
LIBDIR="/opt/32/lib"
8+
89
# PREFIX/etc and PREFIX/share will be replaced by symlinks to /etc and
10+
911
# /usr/share.
1012
BINFMTD="/usr/lib/binfmt.d"
1113
INCLUDE="/opt/32/include"
@@ -20,6 +22,34 @@ QT5DIR="/opt/32/lib/qt5"
2022
QT4BIN="/opt/32/lib/qt4/bin"
2123
QT5BIN="/opt/32/lib/qt5/bin"
2224

25+
# Shared data.
26+
MANDIR="/opt/32/share/man"
27+
FDOAPP="/opt/32/share/applications"
28+
FDOICO="/opt/32/share/icons"
29+
FONTDIR="/opt/32/share/fonts"
30+
DOCDIR="/opt/32/share/doc"
31+
LICDIR="/opt/32/share/doc/licenses"
32+
JAVAMOD="/opt/32/share/java"
33+
GTKDOC="/opt/32/share/gtk-doc"
34+
GSCHEMAS="/opt/32/share/glib-2.0/schemas"
35+
THEMES="/opt/32/share/themes"
36+
BASHCOMP="/opt/32/share/bash-completion"
37+
ZSHCOMP="/opt/32/share/zsh-completion"
38+
LOCALES="/opt/32/share/locales"
39+
VIMDIR="/opt/32/share/vim"
40+
41+
# Configuration directories.
42+
CONFD="/opt/32/etc/conf.d"
43+
ETCDEF="/opt/32/etc/default"
44+
LDSOCONF="/opt/32/etc/ld.so.conf.d"
45+
FCCONF="/opt/32/etc/fonts"
46+
LOGROT="/opt/32/etc/logrotate.d"
47+
CROND="/opt/32/etc/cron.d"
48+
SKELDIR="/opt/32/etc/skel"
49+
X11CONF="/opt/32/etc/X11/xorg.conf.d"
50+
PAMDIR="/opt/32/etc/pam.d"
51+
PROFILED="/opt/32/etc/profile.d"
52+
2353
# optenv32 packages should be packaged as amd64.
2454
export DPKG_ARCH="amd64"
2555
export PATH="$BINDIR:$PATH"
@@ -34,5 +64,5 @@ CFLAGS_COMMON_ARCH=('-fomit-frame-pointer' '-march=x86-64' '-mtune=znver4' '-mss
3464
RUSTFLAGS_COMMON_ARCH=('-Clinker=/opt/32/bin/clang' '-Ctarget-cpu=x86-64')
3565
ab_remove_args RUSTFLAGS_COMMON_OPTI_LTO '-Clinker=clang'
3666

37-
export PKG_CONFIG_PATH="/opt/32/lib/pkgconfig:/usr/share/pkgconfig"
67+
export PKG_CONFIG_PATH="/opt/32/lib/pkgconfig:/opt/32/share/pkgconfig"
3868
unset LDFLAGS_COMMON_CROSS_BASE

0 commit comments

Comments
 (0)