diff --git a/configure.ac b/configure.ac index cc6b560c..9f663987 100644 --- a/configure.ac +++ b/configure.ac @@ -475,7 +475,6 @@ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */ AC_CONFIG_FILES([Makefile contrib/Makefile - contrib/dnscrypt-update-resolvers.sh dist-build/Makefile man/Makefile src/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 61b1054c..851c89d3 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -4,3 +4,13 @@ EXTRA_DIST = \ domains-blacklist.conf \ generate-domains-blacklist.py \ resolvers-check.sh + +noinst_SCRIPTS = \ + dnscrypt-update-resolvers.sh + +dnscrypt-update-resolvers.sh: dnscrypt-update-resolvers.sh.in + $(SED) \ + -e 's|[@]datadir@|$(datadir)|g' \ + -e 's|[@]PACKAGE@|$(PACKAGE)|g' \ + < dnscrypt-update-resolvers.sh.in > dnscrypt-update-resolvers.sh + chmod u+rwx,go+rx dnscrypt-update-resolvers.sh diff --git a/contrib/dnscrypt-update-resolvers.sh.in b/contrib/dnscrypt-update-resolvers.sh.in old mode 100755 new mode 100644 index 04608c91..ed65315f --- a/contrib/dnscrypt-update-resolvers.sh.in +++ b/contrib/dnscrypt-update-resolvers.sh.in @@ -1,7 +1,5 @@ #! /bin/sh -prefix="@prefix@" -datarootdir = "@datarootdir@" PKG_DATA_DIR="@datadir@/@PACKAGE@" RESOLVERS_FILE="${PKG_DATA_DIR}/dnscrypt-resolvers.csv" RESOLVERS_FILE_TMP="${RESOLVERS_FILE}.tmp"