aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-11-11 00:59:38 -0800
committerWladimir J. van der Laan <laanwj@gmail.com>2013-11-11 00:59:38 -0800
commit59be91ae1e8da1e679adbb7c84e8bca749daa8a7 (patch)
tree06777fe95d46dccd5befbcaae84aef7b40fb5c6c /doc
parentfb4a31a26c5fbbedf6f67a24f4c6ad3dba70f7f5 (diff)
parent2b9170746945e5bfc09e2a235c70fee359a224a5 (diff)
Merge pull request #3231 from brandondahler/doc-autotool-update
Update build docs that refer to old makefile.* files.
Diffstat (limited to 'doc')
-rw-r--r--doc/build-msw.md6
-rw-r--r--doc/build-osx.md26
2 files changed, 14 insertions, 18 deletions
diff --git a/doc/build-msw.md b/doc/build-msw.md
index e7e902eaa5..c9f01045ee 100644
--- a/doc/build-msw.md
+++ b/doc/build-msw.md
@@ -76,6 +76,8 @@ Bitcoin
-------
DOS prompt:
- cd \bitcoin\src
- mingw32-make -f makefile.mingw
+ cd \bitcoin
+ sh autogen.sh
+ sh configure
+ mingw32-make
strip bitcoind.exe
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 6ded75d340..f70da685e9 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -56,12 +56,13 @@ Installing the dependencies using MacPorts is very straightforward.
2. Build bitcoind:
- cd src
- make -f makefile.osx
+ ./autogen.sh
+ ./configure
+ make
3. It is a good idea to build and run the unit tests, too:
- make -f makefile.osx test
+ make test
Instructions: HomeBrew
----------------------
@@ -89,22 +90,15 @@ Rerunning "openssl version" should now return the correct version.
git clone git@github.com:bitcoin/bitcoin.git bitcoin
cd bitcoin
-2. Modify source in order to pick up the `openssl` library.
-
- Edit `makefile.osx` to account for library location differences. There's a
- diff in `contrib/homebrew/makefile.osx.patch` that shows what you need to
- change, or you can just patch by doing
-
- patch -p1 < contrib/homebrew/makefile.osx.patch
-
-3. Build bitcoind:
+2. Build bitcoind:
- cd src
- make -f makefile.osx
+ ./autogen.sh
+ ./configure
+ make
-4. It is a good idea to build and run the unit tests, too:
+3. It is a good idea to build and run the unit tests, too:
- make -f makefile.osx test
+ make test
Creating a release build
------------------------