Issue #131: Update config.site

Signed-off-by: Mike Detwiler <mike@detwiler.io>
detwiler · Dec 17, 2022 · 3bdb2c6 · 3bdb2c6
1 parent 56875d7
commit 3bdb2c6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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