summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2010-08-10 22:43:02 +0000
committerNoah Slater <nslater@apache.org>2010-08-10 22:43:02 +0000
commitcc1910f73fbd20c5ffc94bd61e7701d7f5e4c92a (patch)
treedffe636262c322f954b03ae2f16db0b256338f3a /etc
parent6be241f77fdd034026804fb5999414a833d2c099 (diff)
parentb6cc62eb9563103616dbbe59b94cd7f682b5353a (diff)
tagging 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/1.0.1@984255 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile.am11
-rw-r--r--etc/windows/Makefile.am13
2 files changed, 21 insertions, 3 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am
index c166636c..148f7015 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -10,7 +10,7 @@
## License for the specific language governing permissions and limitations under
## the License.
-SUBDIRS = couchdb default init launchd logrotate.d
+SUBDIRS = couchdb default init launchd logrotate.d windows
default_sysconf_data = logrotate.d/couchdb
@@ -25,10 +25,15 @@ endif
nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
-EXTRA_DIST = default/couchdb
+EXTRA_DIST = \
+ default/couchdb \
+ windows/couchdb.iss.tpl \
+ windows/README.txt.tpl
if WINDOWS
-EXTRA_DIST += windows/setup-couchdb-@version@.exe.md5 windows/setup-couchdb-@version@.exe.sha
+EXTRA_DIST += \
+ windows/setup-couchdb-@version@.exe.md5 \
+ windows/setup-couchdb-@version@.exe.sha
endif
CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA)
diff --git a/etc/windows/Makefile.am b/etc/windows/Makefile.am
new file mode 100644
index 00000000..5b4faae0
--- /dev/null
+++ b/etc/windows/Makefile.am
@@ -0,0 +1,13 @@
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not
+## use this file except in compliance with the License. You may obtain a copy of
+## the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+## License for the specific language governing permissions and limitations under
+## the License.
+
+## This file intentionally left blank.