summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--NOTICE16
-rw-r--r--bin/Makefile.am4
-rw-r--r--etc/Makefile.am4
-rw-r--r--etc/default/Makefile.am4
-rw-r--r--etc/init/Makefile.am4
-rw-r--r--etc/launchd/Makefile.am4
-rw-r--r--etc/logrotate.d/Makefile.am4
-rw-r--r--share/Makefile.am4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/couch_inets/Makefile.am4
-rw-r--r--src/couchdb/Makefile.am4
-rw-r--r--var/Makefile.am4
13 files changed, 25 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am
index aa07c7e7..38e7a4ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
@@ -55,6 +55,6 @@ local-clean: maintainer-clean
rm -f couchdb-$(version).tar.gz
rm -f couchdb-$(version).zip
rm -fr m4
- find . -name Makefile.in | grep -v 'src/js/fdlibm' | xargs rm
+ find . -name Makefile.in | xargs rm
.PHONY: local-clean
diff --git a/NOTICE b/NOTICE
index 49a11755..b43b0a11 100644
--- a/NOTICE
+++ b/NOTICE
@@ -32,19 +32,3 @@ src/couch_inets
~~~~~~~~~~~~~~~
* Copyright (C) 1999 Ericsson Utvecklings AB
-
-src/js
-~~~~~~
-
- * Copyright (C) 1999 Netscape Communications Corporation
-
-src/js/editline
-~~~~~~~~~~~~~~~
-
- * Copyright (C) 1993 Simmule Turner
- * Copyright (C) 1993 Rich Salz
-
-src/js/fdlibm
-~~~~~~~~~~~~~
-
- * Copyright (C) 1993 by Sun Microsystems, Inc
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c01d960e..07680c1b 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 5ee51393..96b7cbf5 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
diff --git a/etc/default/Makefile.am b/etc/default/Makefile.am
index 4953462c..d5ccdb15 100644
--- a/etc/default/Makefile.am
+++ b/etc/default/Makefile.am
@@ -7,7 +7,7 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
## This file intentionally left blank.
diff --git a/etc/init/Makefile.am b/etc/init/Makefile.am
index 4953462c..d5ccdb15 100644
--- a/etc/init/Makefile.am
+++ b/etc/init/Makefile.am
@@ -7,7 +7,7 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
## This file intentionally left blank.
diff --git a/etc/launchd/Makefile.am b/etc/launchd/Makefile.am
index 4953462c..d5ccdb15 100644
--- a/etc/launchd/Makefile.am
+++ b/etc/launchd/Makefile.am
@@ -7,7 +7,7 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
## This file intentionally left blank.
diff --git a/etc/logrotate.d/Makefile.am b/etc/logrotate.d/Makefile.am
index 4953462c..d5ccdb15 100644
--- a/etc/logrotate.d/Makefile.am
+++ b/etc/logrotate.d/Makefile.am
@@ -7,7 +7,7 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
## This file intentionally left blank.
diff --git a/share/Makefile.am b/share/Makefile.am
index afd37f14..aa59540e 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d156f74..c86582a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
diff --git a/src/couch_inets/Makefile.am b/src/couch_inets/Makefile.am
index bd11093a..fa5954c1 100644
--- a/src/couch_inets/Makefile.am
+++ b/src/couch_inets/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index bf0c31bc..4b0d553a 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share
diff --git a/var/Makefile.am b/var/Makefile.am
index 7d49a6cc..4b112193 100644
--- a/var/Makefile.am
+++ b/var/Makefile.am
@@ -7,8 +7,8 @@
## 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.
+## License for the specific language governing permissions and limitations
+## under the License.
datarootdir = @prefix@/share