From 87367fcbaf6a466b48a611b09850982b95e83b92 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 5 Oct 2015 15:59:36 +0900 Subject: Set --sysconfdir=/etc all around Technically this is not needed for core OS packages with a / prefix, and not needed for anything which does not install to/read from the sysconfdir... however it's all around safer to just specify it everywhere. Change-Id: I3d8cc58b26c5c2332d6dc08bc87007f774e449af --- strata/core/linux-pam.morph | 2 +- strata/gnome/caribou.morph | 2 +- strata/gnome/clutter.morph | 2 +- strata/gnome/cogl.morph | 2 +- strata/gnome/d-feet.morph | 2 +- strata/gnome/dconf.morph | 2 +- strata/gnome/evolution-data-server.morph | 2 +- strata/gnome/gconf.morph | 2 +- strata/gnome/geoclue.morph | 2 +- strata/gnome/gnome-keyring.morph | 2 +- strata/gnome/gnome-session.morph | 2 +- strata/gnome/gnome-settings-daemon.morph | 2 +- strata/gnome/gnome-shell.morph | 2 +- strata/gnome/gvfs.morph | 2 +- strata/gnome/ibus.morph | 2 +- strata/gnome/icu.morph | 2 +- strata/gnome/libsecret.morph | 2 +- strata/gnome/mozjs17.morph | 1 + strata/gnome/mozjs24.morph | 1 + strata/gnome/p11-kit.morph | 2 +- strata/gnome/polkit.morph | 2 +- strata/gnome/telepathy-glib.morph | 2 +- strata/gnome/upower.morph | 2 +- strata/graphics-common/cairo.morph | 2 +- strata/graphics-common/pixman.morph | 2 +- strata/gtk2/gtk+.morph | 2 +- strata/gtk3/gtk3.morph | 2 +- strata/input-common/libxkbcommon-no-x11.morph | 2 +- strata/input-common/xkeyboard-config.morph | 2 +- strata/libdrm-common/drm.morph | 2 +- strata/libsoup-common/libsoup.morph | 2 +- strata/mesa-common/mesa.morph | 2 +- strata/multimedia-common/libmad.morph | 2 +- strata/network-security/nspr.morph | 2 +- strata/network-security/nss.morph | 2 +- strata/python-pygobject/pygobject.morph | 2 +- strata/python3-core/python3.morph | 2 +- strata/wayland-generic/wayland.morph | 2 +- strata/weston-common/weston.morph | 2 +- 39 files changed, 39 insertions(+), 37 deletions(-) diff --git a/strata/core/linux-pam.morph b/strata/core/linux-pam.morph index 71ad98e9..e6cbf642 100644 --- a/strata/core/linux-pam.morph +++ b/strata/core/linux-pam.morph @@ -6,4 +6,4 @@ pre-configure-commands: configure-commands: # libdir has to be specified or it'll go into lib64. It has to be /lib because # systemd installs its pam library into /lib/security. -- ./configure --prefix="$PREFIX" --libdir="/lib" +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="/lib" diff --git a/strata/gnome/caribou.morph b/strata/gnome/caribou.morph index 19dd6ca4..14827a98 100644 --- a/strata/gnome/caribou.morph +++ b/strata/gnome/caribou.morph @@ -2,4 +2,4 @@ name: caribou kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-gtk2-module +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-gtk2-module diff --git a/strata/gnome/clutter.morph b/strata/gnome/clutter.morph index cb677d8e..d454c6e3 100644 --- a/strata/gnome/clutter.morph +++ b/strata/gnome/clutter.morph @@ -2,5 +2,5 @@ name: clutter kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --enable-wayland-backend --enable-wayland-compositor +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-wayland-backend --enable-wayland-compositor --enable-egl-backend --enable-evdev-input --enable-x11-backend diff --git a/strata/gnome/cogl.morph b/strata/gnome/cogl.morph index 95ab78e3..8c9dca76 100644 --- a/strata/gnome/cogl.morph +++ b/strata/gnome/cogl.morph @@ -2,5 +2,5 @@ name: cogl kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --enable-wayland-egl-platform --enable-wayland-egl-server +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-wayland-egl-platform --enable-wayland-egl-server --enable-kms-egl-platform --enable-xlib-egl-platform --enable-cogl-gst diff --git a/strata/gnome/d-feet.morph b/strata/gnome/d-feet.morph index 8d3e201b..050acb65 100644 --- a/strata/gnome/d-feet.morph +++ b/strata/gnome/d-feet.morph @@ -2,4 +2,4 @@ name: d-feet kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-tests +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-tests diff --git a/strata/gnome/dconf.morph b/strata/gnome/dconf.morph index b9ea35a7..a49efd36 100644 --- a/strata/gnome/dconf.morph +++ b/strata/gnome/dconf.morph @@ -2,4 +2,4 @@ name: dconf kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-man +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man diff --git a/strata/gnome/evolution-data-server.morph b/strata/gnome/evolution-data-server.morph index aa44ca07..4a3841a1 100644 --- a/strata/gnome/evolution-data-server.morph +++ b/strata/gnome/evolution-data-server.morph @@ -2,4 +2,4 @@ name: evolution-data-server kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-goa --disable-uoa --with-libdb=no --disable-google --with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-goa --disable-uoa --with-libdb=no --disable-google --with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr diff --git a/strata/gnome/gconf.morph b/strata/gnome/gconf.morph index 05fdee0e..26930945 100644 --- a/strata/gnome/gconf.morph +++ b/strata/gnome/gconf.morph @@ -2,4 +2,4 @@ name: gconf kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-orbit --disable-documentation +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-orbit --disable-documentation diff --git a/strata/gnome/geoclue.morph b/strata/gnome/geoclue.morph index ce91eff9..7757882c 100644 --- a/strata/gnome/geoclue.morph +++ b/strata/gnome/geoclue.morph @@ -2,4 +2,4 @@ name: geoclue kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-nmea-source +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-nmea-source diff --git a/strata/gnome/gnome-keyring.morph b/strata/gnome/gnome-keyring.morph index bdc2ca70..820c4dcf 100644 --- a/strata/gnome/gnome-keyring.morph +++ b/strata/gnome/gnome-keyring.morph @@ -2,4 +2,4 @@ name: gnome-keyring kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-doc +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-doc diff --git a/strata/gnome/gnome-session.morph b/strata/gnome/gnome-session.morph index d61cb5e9..57f1a85b 100644 --- a/strata/gnome/gnome-session.morph +++ b/strata/gnome/gnome-session.morph @@ -2,4 +2,4 @@ name: gnome-session kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-man --enable-systemd +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man --enable-systemd diff --git a/strata/gnome/gnome-settings-daemon.morph b/strata/gnome/gnome-settings-daemon.morph index bb1123cb..d220fd3e 100644 --- a/strata/gnome/gnome-settings-daemon.morph +++ b/strata/gnome/gnome-settings-daemon.morph @@ -2,4 +2,4 @@ name: gnome-settings-daemon kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-cups --disable-man +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-cups --disable-man diff --git a/strata/gnome/gnome-shell.morph b/strata/gnome/gnome-shell.morph index d8180fb2..dc58f670 100644 --- a/strata/gnome/gnome-shell.morph +++ b/strata/gnome/gnome-shell.morph @@ -2,4 +2,4 @@ name: gnome-shell kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-man --enable-compile-warnings=maximum +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man --enable-compile-warnings=maximum diff --git a/strata/gnome/gvfs.morph b/strata/gnome/gvfs.morph index f6bf47f3..1fde8c82 100644 --- a/strata/gnome/gvfs.morph +++ b/strata/gnome/gvfs.morph @@ -2,4 +2,4 @@ name: gvfs kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-gphoto2 --disable-documentation +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-gphoto2 --disable-documentation diff --git a/strata/gnome/ibus.morph b/strata/gnome/ibus.morph index 8d858a3e..74a8e443 100644 --- a/strata/gnome/ibus.morph +++ b/strata/gnome/ibus.morph @@ -2,4 +2,4 @@ name: ibus kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-gtk2 --disable-gtk3 --disable-xim --disable-tests --enable-wayland +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-gtk2 --disable-gtk3 --disable-xim --disable-tests --enable-wayland diff --git a/strata/gnome/icu.morph b/strata/gnome/icu.morph index 37dec07e..5a9b069a 100644 --- a/strata/gnome/icu.morph +++ b/strata/gnome/icu.morph @@ -1,7 +1,7 @@ name: icu kind: chunk configure-commands: -- cd source; ./runConfigureICU Linux --prefix=/usr +- cd source; ./runConfigureICU Linux --prefix=/usr --sysconfdir=/etc build-commands: - cd source; unset TARGET ; make install-commands: diff --git a/strata/gnome/libsecret.morph b/strata/gnome/libsecret.morph index 054b9f15..b8af29b1 100644 --- a/strata/gnome/libsecret.morph +++ b/strata/gnome/libsecret.morph @@ -2,4 +2,4 @@ name: libsecret kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-manpages +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-manpages diff --git a/strata/gnome/mozjs17.morph b/strata/gnome/mozjs17.morph index 971ebfd3..9ef98854 100644 --- a/strata/gnome/mozjs17.morph +++ b/strata/gnome/mozjs17.morph @@ -5,6 +5,7 @@ configure-commands: - | cd js/src; ./configure --prefix="$PREFIX" \ + --sysconfdir=/etc \ --with-system-nspr \ --with-system-ffi \ --enable-threadsafe diff --git a/strata/gnome/mozjs24.morph b/strata/gnome/mozjs24.morph index a88914c1..a3254305 100644 --- a/strata/gnome/mozjs24.morph +++ b/strata/gnome/mozjs24.morph @@ -5,6 +5,7 @@ configure-commands: - | cd js/src; ./configure --prefix="$PREFIX" \ + --sysconfdir=/etc \ --with-system-nspr \ --with-system-ffi \ --enable-threadsafe diff --git a/strata/gnome/p11-kit.morph b/strata/gnome/p11-kit.morph index b5a67729..8f88969a 100644 --- a/strata/gnome/p11-kit.morph +++ b/strata/gnome/p11-kit.morph @@ -2,4 +2,4 @@ name: p11-kit kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --without-trust-paths +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --without-trust-paths diff --git a/strata/gnome/polkit.morph b/strata/gnome/polkit.morph index a5d7eb1f..2c40ecd0 100644 --- a/strata/gnome/polkit.morph +++ b/strata/gnome/polkit.morph @@ -2,4 +2,4 @@ name: polkit kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-man-pages --disable-gtk-doc --enable-libsystemd-login=yes +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man-pages --disable-gtk-doc --enable-libsystemd-login=yes diff --git a/strata/gnome/telepathy-glib.morph b/strata/gnome/telepathy-glib.morph index e16f3294..88a82c89 100644 --- a/strata/gnome/telepathy-glib.morph +++ b/strata/gnome/telepathy-glib.morph @@ -2,4 +2,4 @@ name: telepathy-glib kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-Werror +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-Werror diff --git a/strata/gnome/upower.morph b/strata/gnome/upower.morph index 889a32b9..00e828bd 100644 --- a/strata/gnome/upower.morph +++ b/strata/gnome/upower.morph @@ -2,4 +2,4 @@ name: upower kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-man-pages +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man-pages diff --git a/strata/graphics-common/cairo.morph b/strata/graphics-common/cairo.morph index f91ac385..cc5a0725 100644 --- a/strata/graphics-common/cairo.morph +++ b/strata/graphics-common/cairo.morph @@ -2,4 +2,4 @@ name: cairo kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --enable-glesv2 +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-glesv2 diff --git a/strata/graphics-common/pixman.morph b/strata/graphics-common/pixman.morph index d09b3df3..7942a964 100644 --- a/strata/graphics-common/pixman.morph +++ b/strata/graphics-common/pixman.morph @@ -2,4 +2,4 @@ name: pixman kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-arm-iwmmxt --disable-arm-iwmmxt2 +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-arm-iwmmxt --disable-arm-iwmmxt2 diff --git a/strata/gtk2/gtk+.morph b/strata/gtk2/gtk+.morph index abbf2510..14d697fa 100644 --- a/strata/gtk2/gtk+.morph +++ b/strata/gtk2/gtk+.morph @@ -4,7 +4,7 @@ build-system: autotools configure-commands: - gdk-pixbuf-query-loaders > loader.cache - NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" +- ./configure --prefix="$PREFIX" --sysconfdir=/etc build-commands: - GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install-commands: diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph index 76007474..7d026803 100644 --- a/strata/gtk3/gtk3.morph +++ b/strata/gtk3/gtk3.morph @@ -4,7 +4,7 @@ build-system: autotools configure-commands: - gdk-pixbuf-query-loaders > loader.cache - NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" +- ./configure --prefix="$PREFIX" --sysconfdir=/etc build-commands: - GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install-commands: diff --git a/strata/input-common/libxkbcommon-no-x11.morph b/strata/input-common/libxkbcommon-no-x11.morph index 1c8a1cb5..95165aaf 100644 --- a/strata/input-common/libxkbcommon-no-x11.morph +++ b/strata/input-common/libxkbcommon-no-x11.morph @@ -9,4 +9,4 @@ description: | build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-x11 +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-x11 diff --git a/strata/input-common/xkeyboard-config.morph b/strata/input-common/xkeyboard-config.morph index ad33b422..2195befe 100644 --- a/strata/input-common/xkeyboard-config.morph +++ b/strata/input-common/xkeyboard-config.morph @@ -1,7 +1,7 @@ name: xkeyboard-config kind: chunk configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-runtime-deps +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-runtime-deps install-commands: - mkdir -p "$DESTDIR"/"$PREFIX"/share/X11/xkb/ - make install DESTDIR="$DESTDIR" diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index acb0f061..fd995148 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -3,5 +3,5 @@ kind: chunk build-system: autotools configure-commands: - | - ./autogen.sh --prefix="$PREFIX" \ + ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \ --enable-tegra-experimental-api diff --git a/strata/libsoup-common/libsoup.morph b/strata/libsoup-common/libsoup.morph index 0a5ebef6..804925aa 100644 --- a/strata/libsoup-common/libsoup.morph +++ b/strata/libsoup-common/libsoup.morph @@ -3,4 +3,4 @@ kind: chunk build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --disable-tls-check +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --disable-tls-check diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 24c290cd..7203dfb9 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -14,7 +14,7 @@ configure-commands: GALLIUMDRIVERS=yes ;; esac - ./autogen.sh --prefix="$PREFIX" \ + ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \ --enable-gles2 \ --with-egl-platforms=drm,wayland,x11 \ --with-gallium-drivers="$GALLIUMDRIVERS" \ diff --git a/strata/multimedia-common/libmad.morph b/strata/multimedia-common/libmad.morph index 839adc15..5e9b1987 100644 --- a/strata/multimedia-common/libmad.morph +++ b/strata/multimedia-common/libmad.morph @@ -7,4 +7,4 @@ configure-commands: case $MORPH_ARCH in mips64*) ARCH_FLAGS="--enable-fpm=64bit" ;; esac - ./configure --prefix="$PREFIX" $ARCH_FLAGS + ./configure --prefix="$PREFIX" --sysconfdir=/etc $ARCH_FLAGS diff --git a/strata/network-security/nspr.morph b/strata/network-security/nspr.morph index 27613eb4..078486e7 100644 --- a/strata/network-security/nspr.morph +++ b/strata/network-security/nspr.morph @@ -9,4 +9,4 @@ configure-commands: *) EXTRA_ARGS="";; esac - ./configure --prefix="$PREFIX" --with-mozilla --with-pthreads $EXTRA_ARGS + ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-mozilla --with-pthreads $EXTRA_ARGS diff --git a/strata/network-security/nss.morph b/strata/network-security/nss.morph index c83fd174..bc50df8c 100644 --- a/strata/network-security/nss.morph +++ b/strata/network-security/nss.morph @@ -4,4 +4,4 @@ max-jobs: 1 build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --libdir="$PREFIX/lib" +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="$PREFIX/lib" diff --git a/strata/python-pygobject/pygobject.morph b/strata/python-pygobject/pygobject.morph index a423537e..72382f93 100644 --- a/strata/python-pygobject/pygobject.morph +++ b/strata/python-pygobject/pygobject.morph @@ -2,4 +2,4 @@ name: pygobject kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-cairo +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-cairo diff --git a/strata/python3-core/python3.morph b/strata/python3-core/python3.morph index f02452d4..fa7bedc9 100644 --- a/strata/python3-core/python3.morph +++ b/strata/python3-core/python3.morph @@ -2,6 +2,6 @@ name: python3 kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --enable-shared +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared post-install-commands: - test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3 diff --git a/strata/wayland-generic/wayland.morph b/strata/wayland-generic/wayland.morph index 752a5d6e..a65afd05 100644 --- a/strata/wayland-generic/wayland.morph +++ b/strata/wayland-generic/wayland.morph @@ -4,4 +4,4 @@ description: Wayland server build-system: autotools configure-commands: - autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-documentation +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --disable-documentation diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph index c49b8d5b..b97294ef 100644 --- a/strata/weston-common/weston.morph +++ b/strata/weston-common/weston.morph @@ -3,5 +3,5 @@ kind: chunk build-system: autotools configure-commands: - | - ./autogen.sh --prefix="$PREFIX" \ + ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \ --enable-demo-clients-install -- cgit v1.2.1