From 3bdb2c6b9e793293938ec6dd4605ced8a110e9c5 Mon Sep 17 00:00:00 2001 From: Mike Detwiler Date: Sat, 17 Dec 2022 06:19:30 +0000 Subject: [PATCH] Issue #131: Update config.site Signed-off-by: Mike Detwiler --- data/autoconf/Makefile.am | 2 ++ data/autoconf/config-site-systemd.in | 1 - data/autoconf/config-site-sysvinit | 1 - data/autoconf/config.site.in | 6 ++---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/data/autoconf/Makefile.am b/data/autoconf/Makefile.am index 57b3300..d2c046a 100644 --- a/data/autoconf/Makefile.am +++ b/data/autoconf/Makefile.am @@ -10,6 +10,8 @@ config_site_sysvinit = config-site-sysvinit # data/scripts generated by configure (source file automatically distributed) conf_data = $(config_site) +$(config_site): $(config_site_systemd) $(config_site_sysvinit) + data_DATA = $(conf_data) DISTCLEANFILES = $(data_DATA) \ diff --git a/data/autoconf/config-site-systemd.in b/data/autoconf/config-site-systemd.in index 7814689..05d63a1 100644 --- a/data/autoconf/config-site-systemd.in +++ b/data/autoconf/config-site-systemd.in @@ -1,4 +1,3 @@ # vim:ft=sh test "$sysconfdir" = '${prefix}/etc' && sysconfdir=`@SYSTEMD_PATH@ user-configuration` -test "$libdir" = '${exec_prefix}/lib' && libdir=`@SYSTEMD_PATH@ user-library-arch` diff --git a/data/autoconf/config-site-sysvinit b/data/autoconf/config-site-sysvinit index 6588462..16ed8d1 100644 --- a/data/autoconf/config-site-sysvinit +++ b/data/autoconf/config-site-sysvinit @@ -1,4 +1,3 @@ # vim:ft=sh test "$sysconfdir" = '${prefix}/etc' && sysconfdir="${XDG_CONFIG_HOME:-$HOME/.config}" -test "$libdir" = '${exec_prefix}/lib' && libdir="$HOME/.local/lib/`uname -m`" diff --git a/data/autoconf/config.site.in b/data/autoconf/config.site.in index 2eaff27..f6e64e2 100644 --- a/data/autoconf/config.site.in +++ b/data/autoconf/config.site.in @@ -1,10 +1,8 @@ -@XDG_BASEDIR_FILE@ +# vim:ft=sh -test "$includedir" = '${prefix}/include' && includedir="$HOME/.local/include" +@XDG_BASEDIR_FILE@ # set FLAGS accordingly test "x$CFLAGS" = x && CFLAGS='-march=native' test "x$CPPFLAGS" = x && CPPFLAGS="-I$includedir" test "x$LDFLAGS" = x && LDFLAGS="-L$libdir -Wl,-rpath,$libdir" - -# vim:ft=sh