couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Fix whitespace and variable name
Date Sat, 24 Nov 2012 20:11:03 GMT
Updated Branches:
  refs/heads/docs 03e69b0b5 -> ca41a432a


Fix whitespace and variable name


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ca41a432
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ca41a432
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ca41a432

Branch: refs/heads/docs
Commit: ca41a432aea5494753f9becca77a07fc77920ea1
Parents: 03e69b0
Author: Noah Slater <nslater@apache.org>
Authored: Sat Nov 24 20:10:57 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Nov 24 20:10:57 2012 +0000

----------------------------------------------------------------------
 bin/Makefile.am             |   28 ++++++++++++++--------------
 share/doc/build/Makefile.am |    4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ca41a432/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2485be9..05f049d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -69,16 +69,16 @@ couch-config: couch-config.tpl
 	    -e "s|%bindir%|@bindir@|g" \
 	    -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \
 	    -e "s|%localconfdir%|@localconfdir@|g" \
-		-e "s|%localdatadir%|$(localdatadir)|g" \
-		-e "s|%localbuilddatadir%|$(localdatadir)|g" \
+	    -e "s|%localdatadir%|$(localdatadir)|g" \
+	    -e "s|%localbuilddatadir%|$(localdatadir)|g" \
 	    -e "s|%localstatelogdir%|@localstatelogdir@|g" \
 	    -e "s|%localstatelibdir%|@localstatelibdir@|g" \
 	    -e "s|%localstatedir%|@localstatedir@|g" \
 	    -e "s|%localstaterundir%|@localstaterundir@|g" \
-		-e "s|%couchlibdir%|@localerlanglibdir@/couch-%version%|g"\
-		-e "s|%couchincludedir%|@localerlanglibdir@/include|g"\
-		-e "s|%couchebindir%|@localerlanglibdir@/ebin|g"\
-		-e "s|%couchprivlibdir%|@localerlanglibdir@/couch-%version%/priv/lib|g"\
+	    -e "s|%couchlibdir%|@localerlanglibdir@/couch-%version%|g"\
+	    -e "s|%couchincludedir%|@localerlanglibdir@/include|g"\
+	    -e "s|%couchebindir%|@localerlanglibdir@/ebin|g"\
+	    -e "s|%couchprivlibdir%|@localerlanglibdir@/couch-%version%/priv/lib|g"\
 	    -e "s|%bug_uri%|@bug_uri@|g" \
 	    -e "s|%package_author_address%|@package_author_address@|g" \
 	    -e "s|%package_author_name%|@package_author_name@|g" \
@@ -92,17 +92,17 @@ couch-config_dev: couch-config.tpl
 	sed -e "s|%ERL%|$(ERL)|g" \
 	    -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
 	    -e "s|%localerlanglibdir%|$(abs_top_builddir)\/src\/couchdb|g" \
-		-e "s|%couchlibdir%|$(abs_top_builddir)\/src\/couchdb|g"\
-		-e "s|%couchincludedir%|$(abs_top_builddir)\/src\/couchdb|g"\
-		-e "s|%couchebindir%|$(abs_top_builddir)\/src\/couchdb|g"\
-		-e "s|%couchprivlibdir%|$(abs_top_builddir)/src/couchdb/priv/.libs|g"\
-		-e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
-		-e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
+	    -e "s|%couchlibdir%|$(abs_top_builddir)\/src\/couchdb|g"\
+	    -e "s|%couchincludedir%|$(abs_top_builddir)\/src\/couchdb|g"\
+	    -e "s|%couchebindir%|$(abs_top_builddir)\/src\/couchdb|g"\
+	    -e "s|%couchprivlibdir%|$(abs_top_builddir)/src/couchdb/priv/.libs|g"\
+	    -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
+	    -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
 	    -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
 	    -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
-		-e "s|%localstatedir%|$(abs_top_builddir)/tmp|g" \
+	    -e "s|%localstatedir%|$(abs_top_builddir)/tmp|g" \
 	    -e "s|%localstaterundir%|$(abs_top_builddir)/tmp/run|g" \
-		-e "s|%bug_uri%|@bug_uri@|g" \
+	    -e "s|%bug_uri%|@bug_uri@|g" \
 	    -e "s|%package_author_address%|@package_author_address@|g" \
 	    -e "s|%package_author_name%|@package_author_name@|g" \
 	    -e "s|%package_name%|@package_name@|g" \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ca41a432/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index f6b7bda..ebb1753 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -241,9 +241,9 @@ install-data-local:
 
 # @@ check AM_UPDATE_INFO_DIR=no
 uninstall-local:
-	rm -f $(DESTDIR)$(infodir)/$(info_name)
+	rm -f $(DESTDIR)$(infodir)/$(info_file_inst)
 	if test -n "`which install-info`"; then\
-	    install-info --delete --info-dir=$(DESTDIR)$(infodir) $(info_name) ; \
+	    install-info --delete --info-dir=$(DESTDIR)$(infodir) $(info_file_inst) ; \
 	fi
 
 DISTCLEANFILES = \


Mime
View raw message