ship dnsdistconf.lua in tarball, move to symlinks to ../ for dnsdistdist

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 3505d94939ae024ce6f29676cb6683afbd88ed4f..db13db70b4d63dc3c7873851687392491fc7aa50 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) -O3 -Wall -pthread
 dnslabeltext.cc: dnslabeltext.rl
        $(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
 
-EXTRA_DIST=dnslabeltext.rl
+EXTRA_DIST=dnslabeltext.rl dnsdistconf.lua
 
 bin_PROGRAMS = dnsdist
 dnsdist_SOURCES = \

diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index 865585bdf0d9b66af930c9f9af4d05eb3d731a1a..f564f8aa039a70ee812ddb15d9f5d1c4e88a0eae 100644 (file)
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -1,10 +1,11 @@
 #!/bin/bash
 
-cp ../base32.hh ../base64.cc ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc ../dns.hh \
+ln -fs ../base32.hh ../base64.cc ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc ../dns.hh \
 ../dnslabeltext.{cc,rl} ../dnsname.cc ../dnsname.hh ../dnsparser.hh ../dnswriter.cc ../dnswriter.hh \
 ../dolog.hh ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
 ../pdnsexception.hh ../qtype.cc ../qtype.hh ../sodcrypto.cc ../sodcrypto.hh ../sstuff.hh .
 
+ln -fs ../dnsdistconf.lua .
 mkdir -p pdns/ext/luawrapper/include
-cp ../ext/luawrapper/include/LuaContext.hpp pdns/ext/luawrapper/include
+ln -sf ../../../../../ext/luawrapper/include/LuaContext.hpp pdns/ext/luawrapper/include