You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/11/24 21:25:10 UTC
git commit: Fixed build issues
Updated Branches:
refs/heads/docs ca41a432a -> ee091f488
Fixed build issues
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ee091f48
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ee091f48
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ee091f48
Branch: refs/heads/docs
Commit: ee091f48869e51133efabd5feff1c20b65001b3f
Parents: ca41a43
Author: Noah Slater <ns...@apache.org>
Authored: Sat Nov 24 20:25:06 2012 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Sat Nov 24 20:25:06 2012 +0000
----------------------------------------------------------------------
bin/Makefile.am | 7 ++++++-
share/doc/build/Makefile.am | 6 ++++++
src/couchdb/priv/Makefile.am | 6 ++++--
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee091f48/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 05f049d..841e94c 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -24,7 +24,9 @@ man_file = couchdb.1
BUILT_SOURCES = $(man_file)
-CLEANFILES = $(bin_SCRIPTS) $(dist_man1_MANS) $(noinst_SCRIPTS)
+EXTRA_DIST = $(man_file)
+
+CLEANFILES = $(bin_SCRIPTS) $(man_file) $(noinst_SCRIPTS)
transform = @program_transform_name@
couchdb_command_name = `echo couchdb | sed '$(transform)'`
@@ -130,3 +132,6 @@ install-data-local:
$(INSTALL) -d $(DESTDIR)$(man1dir); \
$(INSTALL_DATA) $(man_file) $(DESTDIR)$(man1dir)/$(man_file); \
fi
+
+uninstall-local:
+ rm -f $(DESTDIR)$(man1dir)/$(man_file)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee091f48/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index ebb1753..976350f 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -245,6 +245,12 @@ uninstall-local:
if test -n "`which install-info`"; then\
install-info --delete --info-dir=$(DESTDIR)$(infodir) $(info_file_inst) ; \
fi
+ rm -f $(DESTDIR)$(localdocdir)/$(pdf_file_inst)
+ for file in $(html_files); do \
+ if test -s $$file; then \
+ rm -f $(DESTDIR)$(localdocdir)/$$file; \
+ fi \
+ done
DISTCLEANFILES = \
info.stamp \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee091f48/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 3474800..589510e 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -25,9 +25,10 @@ EXTRA_DIST = \
couch_ejson_compare/erl_nif_compat.h \
couch_js/sm170.c \
couch_js/sm180.c \
- couch_js/sm185.c
+ couch_js/sm185.c \
+ $(man_file)
-CLEANFILES = $(dist_man1_MANS) stat_descriptions.cfg
+CLEANFILES = $(man_file) stat_descriptions.cfg
couchprivlib_LTLIBRARIES = couch_icu_driver.la
if USE_EJSON_COMPARE_NIF
@@ -125,6 +126,7 @@ if WINDOWS
endif
uninstall-local:
+ rm -f $(DESTDIR)$(man1dir)/$(man_file)
if test -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver"; then \
rm -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver.so"; \
fi