Integrate HACKING into README

diff --git a/HACKING b/HACKING
deleted file mode 100644 (file)
index adc62ee..0000000
--- a/HACKING
+++ /dev/null
@@ -1,13 +0,0 @@
-PowerDNS has moved to GitHub, the repository is at https://github.com/PowerDNS/pdns
-
-Then:
-
-$ ./bootstrap
-
-you may need to do that twice. You also need libtool-1.4, 1.3 won't work.
-Automake 1.6 is (almost) required.
-
-Send any patches you may have to the mailinglist:
-                        pdns-dev@mailman.powerdns.com
-
-Thanks!

diff --git a/Makefile.am b/Makefile.am
index fc6a6e450352e79e39d1ed908b91d314aee8bfa0..2e08c1f8428ecbb56c33b3b3af02eb5c66ea8cec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=modules codedocs @programdescend@
 DIST_SUBDIRS=modules codedocs pdns pdns/ext/rapidjson
-EXTRA_DIST=README HACKING INSTALL NOTICE debian-pdns/* pdns.spec  \
+EXTRA_DIST=README INSTALL NOTICE debian-pdns/* pdns.spec  \
 codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
 contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \
 bootstrap build-scripts/semistaticg++ pdns/docs/dnstcpbench.1 \

diff --git a/README.md b/README.md
index 6dda811e416d1602172c5cddfd96f54aafb82aa3..3b5a724d5c2f0de524ad8d6a45fbd8ff56e32644 100644 (file)
--- a/README.md
+++ b/README.md
@@ -32,7 +32,14 @@ PowerDNS Authoritative Server 3.0 and beyond depend on Boost.
 On Debian 7.0, the following is useful:
 
     apt-get install autoconf automake bison flex g++ git libboost-all-dev libtool make pkg-config ragel
-    
+
+If you build from git, first build configure:
+
+    $ ./bootstrap
+
+(You may need to do that twice. You also need libtool-1.4, 1.3 won't work.
+Automake 1.6 or newer is required, too.)
+
 To compile a very clean version, use:
 
     $ ./configure --with-modules="" --without-lua

diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index 53d1ba6f4965af68fb122ebfd0d34561c04a8cda..d552cd6396d7340f8bc62a7b275db62691a4ed51 100644 (file)
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -17290,10 +17290,10 @@ This setting will make PowerDNS renotify the slaves after an AXFR is *received*
            </listitem>
          </varlistentry>
          <varlistentry>
-           <term>Q: I'm trying to build from SVN but I get lots of weird errors!</term>
+           <term>Q: I'm trying to build from Git but I get lots of weird errors!</term>
            <listitem>
              <para>
-               A: Read the 'HACKING' file, it lists the build requirements (mostly autoconf, automake, libtool). In many cases, 
+               A: Read the 'README' file, it lists the build requirements (mostly autoconf, automake, libtool). In many cases,
                it may be easier to build from the source distribution though. More information for developers
                is available on <ulink url="http://wiki.powerdns.com">the PowerDNS Open Source Community Wiki</ulink>.
              </para>