rec: only include generated pubsuffix.cc in dist file

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh
index ebb338d9162cdfe47fc02b0804caa2625edc0722..da37fd59225bc3fac6679735abbdc5cec180bedf 100755 (executable)
--- a/pdns/recursordist/meson-dist-script.sh
+++ b/pdns/recursordist/meson-dist-script.sh
@@ -36,6 +36,6 @@ echo 'If the below command generates an error, remove dnslabeltext.cc from sourc
 ninja librec-dnslabeltext.a.p/dnslabeltext.cc
 cp -vp librec-dnslabeltext.a.p/dnslabeltext.cc "$MESON_PROJECT_DIST_ROOT"
 echo 'If the below command generates an error, remove effective_tld_names.dat and pubsuffix.cc from source dir (remains of an autotools build?) and start again with a clean meson setup'
-ninja effective_tld_names.dat
-cp -vp effective_tld_names.dat "$MESON_PROJECT_DIST_ROOT"
+ninja pubsuffix.cc
+cp -vp pubsuffix.cc "$MESON_PROJECT_DIST_ROOT"
 

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 65338ee32f939dff92930f7b7dd37577e7c6253e..1b79818b3722f17bbe0fc2cec8238fa73fb066bd 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -357,14 +357,12 @@ librec_signers_openssl = declare_dependency(
 pubsuffix_dl_source =  'effective_tld_names.dat'
 pubsuffix_cc = src_dir / 'pubsuffix.cc'
 if not fs.is_file(pubsuffix_cc)
-  if not fs.is_file(pubsuffix_dl_source)
-    curl_command = find_program('curl', required: true)
-    pubsuffix_dl_source = custom_target(
-      'pubsuffix-dl',
-      command: [curl_command, '-s', '-S', '-o', '@OUTPUT@', 'https://publicsuffix.org/list/public_suffix_list.dat'],
-      output: pubsuffix_dl_source
-    )
-  endif
+  curl_command = find_program('curl', required: true)
+  pubsuffix_dl_source = custom_target(
+    'pubsuffix-dl',
+    command: [curl_command, '-s', '-S', '-o', '@OUTPUT@', 'https://publicsuffix.org/list/public_suffix_list.dat'],
+    output: pubsuffix_dl_source
+  )
 
   mkpubsuffix_command = find_program('mkpubsuffixcc', required: true)
   pubsuffix_cc = custom_target(