summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2012-12-06 22:19:28 +0000
committerDave Cottlehuber <dch@apache.org>2012-12-11 22:01:23 +0100
commit6c3c7b83a4eee441d8449fd391e0385c48811785 (patch)
tree933045b97b50c690f44816e8ddc0e9d60ce68fe7 /bin
parent3734f5da1a1e3e2bc62bb5f50dce9343118e2a99 (diff)
downloadcouchdb-6c3c7b83a4eee441d8449fd391e0385c48811785.tar.gz
Added support for `make -j` and `make -n`
Diffstat (limited to 'bin')
-rw-r--r--bin/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am
index d666bbd1c..3d7a075df 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -10,6 +10,8 @@
## License for the specific language governing permissions and limitations under
## the License.
+MAKE_SAFE = $(MAKE)
+
if WINDOWS
bin_SCRIPTS = couchdb.bat
else
@@ -122,7 +124,7 @@ couch-config_dev: couch-config.tpl
# Depend on source files so distributed man pages are not rebuilt for end user.
$(man_file): couchdb.tpl.in
- $(MAKE) -f Makefile couchdb; \
+ $(MAKE_SAFE) -f Makefile couchdb; \
$(top_srcdir)/build-aux/missing --run \
help2man \
--no-info \