summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rw-r--r--etc/couchdb/Makefile.am6
2 files changed, 4 insertions, 3 deletions
diff --git a/THANKS b/THANKS
index 905a4000..fce42783 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ suggesting improvements or submitting changes.
Some of these people are:
+ * Mark Baran <mebaran@gmail.com>
* William Beh <willbeh@gmail.com>
* Yoan Blanc <yoan.blanc@gmail.com>
* Benoit Chesneau <bchesneau@gmail.com>
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index b2399dcc..382d5425 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -30,9 +30,9 @@ default.ini: default.ini.tpl
< $< > $@
install-data-hook:
- if test ! -f "$(localconfdir)/local.ini"; then \
- cp local.ini "$(localconfdir)/local.ini"; \
+ if test ! -f "$(DESTDIR)/$(localconfdir)/local.ini"; then \
+ cp local.ini "$(DESTDIR)/$(localconfdir)/local.ini"; \
fi
uninstall-local:
- rm -f "$(localconfdir)/local.ini"
+ rm -f "$(DESTDIR)/$(localconfdir)/local.ini"