Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MB-6431 Update arguments to memcachetest

Change-Id: I3fd44d3a54ad646d16478efa836a2c91911efbab
Reviewed-on: http://review.couchbase.org/20180
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information...
commit 41be7f50de45919c1ecc05ba4b2721279bd2ec7b 1 parent 79b0a43
@trondn trondn authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 Makefile.top
View
4 Makefile.top
@@ -158,7 +158,6 @@ $(patsubst %, deps-for-%, $(BUILD_COMPONENTS)):
libmemcached_OPTIONS := $(LIBRARY_OPTIONS) --disable-dtrace --without-docs --disable-sasl --without-memcached
ifndef CROSS_COMPILING
-memcachetest_OPTIONS += --with-memcached=$(DESTDIR)$(PREFIX)/bin/memcached
deps-for-libmemcached: make-install-memcached
endif
@@ -176,7 +175,8 @@ libcouchbase_EXTRA_OPTIONS := 'LDFLAGS=-L$(DESTDIR)$(PREFIX)/lib $(LDFLAGS)' \
'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
deps-for-libcouchbase: make-install-libvbucket make-install-memcached
-memcachetest_EXTRA_MAKE_OPTIONS := 'CPPFLAGS=-I$(TOPDIR)/memcached/include -I$(TOPDIR)/libmemcached -I$(TOPDIR)/libvbucket/include -I$(PREFIX)/include $(CPPFLAGS)'
+memcachetest_EXTRA_MAKE_OPTIONS := 'LDFLAGS=-L$(DESTDIR)$(PREFIX)/lib $(LDFLAGS)' \
+ 'CPPFLAGS=-I$(DESTDIR)$(PREFIX)/include $(CPPFLAGS)'
deps-for-memcachetest: make-install-memcached make-install-libmemcached make-install-libvbucket
ep-engine_OPTIONS := --with-memcached=../memcached $(WITH_DEBUG_FLAG)
Please sign in to comment.
Something went wrong with that request. Please try again.