From 2bb8ce5364a7e99674e712f2e4db4961f8acf080 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Thu, 6 Sep 2018 10:50:39 -0400 Subject: Fix autoconf install variables --- Makefile.in | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 099a89a..124b32a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,8 +13,8 @@ sbindir = @sbindir@ sysconfdir = @sysconfdir@ localstatedir = @localstatedir@ mandir = @mandir@ -systemdsystemunitdir = @systemdsystemunitdir@ -default_seed_path_dir = @default_seed_path_dir@ +systemdsystemunitdir = @SYSTEMDSYSTEMUNITDIR@ +default_seed_dir = @DEFAULT_SEED_DIR@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -69,7 +69,7 @@ endif systemd/random-seed.service systemd/random-seed-save.service: Makefile @mkdir -p $(@D) sed -e 's|@sbindir[@]|$(sbindir)|g' \ - -e 's|@default_seed_path_dir[@]|$(default_seed_path_dir)|g' \ + -e 's|@default_seed_dir[@]|$(default_seed_path_dir)|g' \ $< > $@ systemd/random-seed.service: systemd/random-seed.service.in diff --git a/configure.ac b/configure.ac index b802932..c4f753c 100644 --- a/configure.ac +++ b/configure.ac @@ -88,10 +88,10 @@ AC_ARG_VAR([DEFAULT_RANDOM_SEED_PATH], [default seed path if no command line arg AS_IF([test -z "$DEFAULT_RANDOM_SEED_PATH"], [ DEFAULT_RANDOM_SEED_PATH=/var/lib/random-seed ]) -AC_DEFINE_UNQUOTED(DEFAULT_SEED_PATH, "$DEFAULT_SEED_PATH", [default seed path]) +AC_DEFINE_UNQUOTED(DEFAULT_SEED_PATH, "$DEFAULT_RANDOM_SEED_PATH", [default seed path]) # everybody has POSIX shell now. -DEFAULT_SEED_PATH_DIR=${DEFAULT_SEED_PATH%/*} -AC_SUBST(DEFAULT_SEED_PATH_DIR) +DEFAULT_SEED_DIR=${DEFAULT_RANDOM_SEED_PATH%/*} +AC_SUBST(DEFAULT_SEED_DIR) AX_APPEND_FLAG(-D_GNU_SOURCE, CPPFLAGS) AX_APPEND_FLAG(-D_DEFAULT_SOURCE, CPPFLAGS) -- cgit v1.2.3-54-g00ecf