Fix dnsdist so it uses the correct ext/ dir

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index a96172117ea6e72df75898ba89dda713b68aa94a..bb54ac1d9ebe87f20b124cd37bb4ac0f3689241b 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\"
 
-SUBDIRS=pdns/ext/yahttp
+SUBDIRS=ext/yahttp
 
 dnslabeltext.cc: dnslabeltext.rl
        ragel $< -o dnslabeltext.cc
@@ -42,10 +42,11 @@ dnsdist_SOURCES = \
        qtype.cc qtype.hh \
        sholder.hh \
        sodcrypto.cc sodcrypto.hh \
-       sstuff.hh pdns/ext/luawrapper/include/LuaContext.hpp \
-       pdns/ext/json11/json11.cpp \
-       pdns/ext/json11/json11.hpp \
-       pdns/ext/incbin/incbin.h
+       sstuff.hh \
+       ext/luawrapper/include/LuaContext.hpp \
+       ext/json11/json11.cpp \
+       ext/json11/json11.hpp \
+       ext/incbin/incbin.h
 
 dnsdist_LDFLAGS = \
        $(AM_LDFLAGS) \

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 8825a7b94821e323dcab8e92c1621b5a25d6f98c..7d3d66dc6a34ef03c173551f7afda74e7725b533 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -10,13 +10,13 @@ AC_PROG_LIBTOOL
 AX_LIB_READLINE
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
-AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/pdns/ext/yahttp'])
-AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/pdns/ext/yahttp/yahttp -lyahttp'])
+AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
+AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp'])
 PDNS_WITH_LUA
 AX_CXX_COMPILE_STDCXX_11(ext,mandatory)
 
 AC_CONFIG_FILES([Makefile
-       pdns/ext/yahttp/Makefile
-       pdns/ext/yahttp/yahttp/Makefile])
+       ext/yahttp/Makefile
+       ext/yahttp/yahttp/Makefile])
        
 AC_OUTPUT

diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index c32e06b309701731be091950f425f6f8aa1aff55..997bd5fb59e973d755ca8308e39d2747875120cd 100755 (executable)
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -19,20 +19,20 @@ ln -fs ../../../m4/ax_cxx_compile_stdcxx_11.m4 m4/
 ln -fs ../README-dnsdist.md README.md
 ln -fs ../dnsdistconf.lua .
 
-mkdir -p pdns/ext/luawrapper/include
-ln -sf ../../../../../ext/luawrapper/include/LuaContext.hpp pdns/ext/luawrapper/include
+mkdir -p ext/luawrapper/include
+ln -sf ../../../../../ext/luawrapper/include/LuaContext.hpp ext/luawrapper/include
 
-mkdir -p pdns/ext/json11
-ln -sf ../../../../ext/json11/json11.{hpp,cpp} pdns/ext/json11
+mkdir -p ext/json11
+ln -sf ../../../../ext/json11/json11.{hpp,cpp} ext/json11
 
-mkdir -p pdns/ext/incbin
-ln -sf ../../../../ext/incbin/incbin.h pdns/ext/incbin
+mkdir -p ext/incbin
+ln -sf ../../../../ext/incbin/incbin.h ext/incbin
 
 pandoc -s -t man ../../docs/manpages/dnsdist.1.md > dnsdist.1
 
-mkdir -p pdns/ext/yahttp/yahttp
-ln -sf ../../../../ext/yahttp/Makefile.am pdns/ext/yahttp
-cd pdns/ext/yahttp/
+mkdir -p ext/yahttp/yahttp
+ln -sf ../../../../ext/yahttp/Makefile.am ext/yahttp
+cd ext/yahttp/
 ln -sf ../../../../ext/yahttp/{LICENSE,README.md} .
 cd yahttp
 ln -sf ../../../../../ext/yahttp/yahttp/{Makefile.am,*.cpp,*.hpp,*.h} .