You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2008/08/16 23:11:57 UTC
svn commit: r686564 - /incubator/couchdb/branches/runtimeconfig/Makefile.am
Author: jan
Date: Sat Aug 16 14:11:56 2008
New Revision: 686564
URL: http://svn.apache.org/viewvc?rev=686564&view=rev
Log:
fix merge issue
Modified:
incubator/couchdb/branches/runtimeconfig/Makefile.am
Modified: incubator/couchdb/branches/runtimeconfig/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/Makefile.am?rev=686564&r1=686563&r2=686564&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/Makefile.am Sat Aug 16 14:11:56 2008
@@ -36,25 +36,22 @@
THANKS.gz: $(top_srcdir)/THANKS
-gzip -9 < $< > $@
-<<<<<<< .working
-bootstrap-clean: maintainer-clean
-=======
.PHONY: local-clean
local-clean: maintainer-clean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may need special tools to rebuild."
- -rm -f INSTALL
- -rm -f acinclude.m4
- -rm -f aclocal.m4
- -rm -f config.h.in
- -rm -f configure
- -rm -f *.tar.gz
- -rm -f *.tar.gz.asc
- -rm -f *.tar.gz.md5
- -rm -f *.tar.gz.sha
- -rm -fr build-aux
- -rm -fr m4
- -find $(top_srcdir) -name Makefile.in | xargs rm
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may need special tools to rebuild."
+ -rm -f INSTALL
+ -rm -f acinclude.m4
+ -rm -f aclocal.m4
+ -rm -f config.h.in
+ -rm -f configure
+ -rm -f *.tar.gz
+ -rm -f *.tar.gz.asc
+ -rm -f *.tar.gz.md5
+ -rm -f *.tar.gz.sha
+ -rm -fr build-aux
+ -rm -fr m4
+ -find $(top_srcdir) -name Makefile.in | xargs rm
.PHONY: distsign
distsign: distcheck