From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 2 Oct 2013 08:51:24 +0000 (+0200)
Subject: Properly checkout Net-LDNS with makedist
X-Git-Tag: release-1.6.17rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6c6039c165e2ff24763537ba13fa6e763fcf500;p=thirdparty%2Fldns.git

Properly checkout Net-LDNS with makedist
---

diff --git a/contrib/Net-LDNS b/contrib/Net-LDNS
index 1ba90fca..a2c5826f 160000
--- a/contrib/Net-LDNS
+++ b/contrib/Net-LDNS
@@ -1 +1 @@
-Subproject commit 1ba90fca6924bff0b1bc789cde4c1e423ab0bd31
+Subproject commit a2c5826fb90ca7431cbbf4a9eb7f00be6f3a5c84
diff --git a/makedist.sh b/makedist.sh
index 0c3cd63b..8eba9e33 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -120,7 +120,8 @@ info "Exporting source from GIT"
 git clone git://git.nlnetlabs.nl/ldns/ || error_cleanup "git command failed"
 cd ldns || error_cleanup "LDNS not exported correctly from git"
 git checkout "$CHECKOUT" || error_cleanup "Could not checkout $CHECKOUT"
-git submodule update --init || error_cleanup "Could not checkout submodules"
+git submodule update --init || error_cleanup "Could not update submodules"
+(cd contrib/Net-LDNS; git checkout master) || error_cleanup "Could not checkout Net-LDNS contribution"
 
 info "Running  Libtoolize script (libtoolize)."
 libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed."
@@ -139,6 +140,7 @@ rm -r autom4te* drill/autom4te* examples/autom4te* || error_cleanup "Failed to r
 # custom removes
 find . -name .c-mode-rc.el -exec rm {} \;
 find . -name .cvsignore -exec rm {} \;
+find . -name ".git*" -exec rm -fr {} \;
 rm -rf lua 
 rm -rf masterdont 
 rm makedist.sh || error_cleanup "Failed to remove makedist.sh."