Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

don't hardcode DESTDIR into config files

DESTDIR is for installing files. We still need to assume PREFIX is our
final destination.

Change-Id: I4f6310aeb9c6f9777b859718c9ea5ee01d7d0d6b
Reviewed-on: http://review.couchbase.org/15218
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Srinivas Vadlamani <srinivas@couchbase.com>
  • Loading branch information...
commit 363619c7472f4fb2e4bcef5b7797032f3d1ea7a9 1 parent 4d6ffc2
@alk alk authored Srinivas Vadlamani committed
Showing with 3 additions and 3 deletions.
  1. +3 −3 Makefile
View
6 Makefile
@@ -101,7 +101,7 @@ endif
endif
-PREFIX_FOR_CONFIG ?= $(DESTDIR)$(PREFIX)
+PREFIX_FOR_CONFIG ?= $(PREFIX)
ERLWSH_LIBDIR := $(DESTDIR)$(PREFIX)/lib/ns_server/erlang/lib/erlwsh
GEN_SMTP_LIBDIR := $(DESTDIR)$(PREFIX)/lib/ns_server/erlang/lib/gen_smtp
@@ -126,8 +126,8 @@ do-install:
<etc/static_config.in >$(DESTDIR)$(PREFIX)/etc/couchbase/static_config
touch $(DESTDIR)$(PREFIX)/etc/couchbase/config
mkdir -p $(DESTDIR)$(PREFIX)/bin/
- sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <couchbase-server.sh.in >$(DESTDIR)$(PREFIX)/bin/couchbase-server
- sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <cbbrowse_logs.in >$(DESTDIR)$(PREFIX)/bin/cbbrowse_logs
+ sed -e 's|@PREFIX@|$(PREFIX)|g' <couchbase-server.sh.in >$(DESTDIR)$(PREFIX)/bin/couchbase-server
+ sed -e 's|@PREFIX@|$(PREFIX)|g' <cbbrowse_logs.in >$(DESTDIR)$(PREFIX)/bin/cbbrowse_logs
cp cbcollect_info $(DESTDIR)$(PREFIX)/bin/cbcollect_info
chmod +x $(DESTDIR)$(PREFIX)/bin/couchbase-server $(DESTDIR)$(PREFIX)/bin/cbbrowse_logs $(DESTDIR)$(PREFIX)/bin/cbcollect_info
mkdir -p $(DESTDIR)$(PREFIX)/var/lib/couchbase/mnesia
Please sign in to comment.
Something went wrong with that request. Please try again.