Skip a few files and dirs in the meson dist tarball

diff --git a/pdns/recursordist/.gitattributes b/pdns/recursordist/.gitattributes
new file mode 100644 (file)
index 0000000..3f006fb
--- /dev/null
+++ b/pdns/recursordist/.gitattributes
@@ -0,0 +1,7 @@
+Caddyfile export-ignore
+/README.md export-ignore
+docs export-ignore
+examples export-ignore
+make-ext-symlinks.py export-ignore
+recursor-lsan.supp export-ignore
+recursor-tsan.supp export-ignore

diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh
index 4ce83e3442a2fad55c718e9332a409a861e7125b..a8699d94dd02e0f2195391475838a6fa987c3b92 100755 (executable)
--- a/pdns/recursordist/meson-dist-script.sh
+++ b/pdns/recursordist/meson-dist-script.sh
@@ -24,9 +24,14 @@ cd "$MESON_PROJECT_BUILD_ROOT"
 ninja man-pages
 cp -vp rec-man-pages/*.1 "$MESON_PROJECT_DIST_ROOT"
 
+rm -rf "$MESON_PROJECT_DIST_ROOT"/autom4te.cache
+
+
 # Generate  a few files to reduce build dependencies
-ninja  librec-dnslabeltext.a.p/dnslabeltext.cc
+echo 'If the below command generates an error, remove dnslabeltext.cc from source dir (remains of an autotools build?) and start again with a clean meson setup'
+ninja librec-dnslabeltext.a.p/dnslabeltext.cc
 cp -vp librec-dnslabeltext.a.p/dnslabeltext.cc "$MESON_PROJECT_DIST_ROOT"
-ninja  effective_tld_names.dat
+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"