summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-08-18 04:01:39 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-08-18 04:01:39 +0000
commitcaeae66a3f428f2b4f4a3084cf6752bee77fb1b9 (patch)
tree458785dd8fc3f5fb0cc32a24e88426ac71a8d7b0
parent2652d5a16d80bb4156b1d6df1b6922ba3d9e423c (diff)
Add license notice to couchdb.bat.tpl.in
Fix naming issue for windows c16e.exe git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@805271 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--bin/couchdb.bat.tpl.in12
-rw-r--r--src/couchdb/Makefile.am2
2 files changed, 13 insertions, 1 deletions
diff --git a/bin/couchdb.bat.tpl.in b/bin/couchdb.bat.tpl.in
index 99c096f1..6c1f3aed 100644
--- a/bin/couchdb.bat.tpl.in
+++ b/bin/couchdb.bat.tpl.in
@@ -1,4 +1,16 @@
@echo off
+rem Licensed under the Apache License, Version 2.0 (the "License"); you may not
+rem use this file except in compliance with the License. You may obtain a copy
+rem of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+rem WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+rem License for the specific language governing permissions and limitations
+rem under the License.
+
setlocal
rem First change to the erlang bin directory
cd %~dp0
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index 9c3a5f68..a7ab54ef 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -224,7 +224,7 @@ if WINDOWS
# what gets installed for 'couchspawnkillable' - but the correct one for
# couchjs.exe *does* get copied. *shrug* So just clobber it with the
# correct one here... See bug COUCHDB-439
- $(INSTALL) priv/.libs/couchspawnkillable_win.exe "$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
+ $(INSTALL) priv/.libs/couchspawnkillable.exe "$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
endif
uninstall-local: