Skip to content

Commit b7a18d7

Browse files
authored
Merge pull request #16165 from rgacogne/ci-test-release-tarballs-with-meson
dnsdist and rec: Prevent generating release tarballs via autotools
2 parents e5781fc + 377ddbe commit b7a18d7

4 files changed

Lines changed: 6 additions & 34 deletions

File tree

build-scripts/dist-dnsdist

Lines changed: 0 additions & 15 deletions
This file was deleted.

build-scripts/dist-recursor

Lines changed: 0 additions & 15 deletions
This file was deleted.

pdns/dnsdistdist/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,3 +822,7 @@ endif
822822
if !HAVE_LUA_HPP
823823
include lua_hpp.mk
824824
endif
825+
826+
dist-hook:
827+
@echo "\`make dist' is no longer supported, use \`meson dist'" >&2
828+
@false

pdns/recursordist/Makefile.am

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,8 @@ EXTRA_DIST = \
9292
builder-support/gen-version
9393

9494
dist-hook:
95-
for file in $$(find $(distdir)/docs -type l); do \
96-
t=`stat -c%N $$file | awk '{print $$NF}' | sed "s/'//g"` ; \
97-
ln -fs ../$$t $$file; \
98-
done
95+
@echo "\`make dist' is no longer supported, use \`meson dist'" >&2
96+
@false
9997

10098
sbin_PROGRAMS = pdns_recursor
10199
bin_PROGRAMS = rec_control

0 commit comments

Comments
 (0)