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 2013/12/16 21:18:40 UTC
[06/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Fix install-data-local target
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/68ab6734
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/68ab6734
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/68ab6734
Branch: refs/heads/1964-feature-fauxton-build
Commit: 68ab673459ce2f730d1073ec57f47f8e50787273
Parents: 8414d6d
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 17:27:39 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 17:27:39 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/68ab6734/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index ae97423..b56a168 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -287,13 +287,13 @@ fauxton_src_files = \
fauxton_build_files = \
build/css/index.css \
+ build/img/FontAwesome.otf \
build/img/couchdb-site.png \
build/img/couchdblogo.png \
build/img/fontawesome-webfont.eot \
build/img/fontawesome-webfont.svg \
build/img/fontawesome-webfont.ttf \
build/img/fontawesome-webfont.woff \
- build/img/FontAwesome.otf \
build/img/fontcustom_fauxton.eot \
build/img/fontcustom_fauxton.svg \
build/img/fontcustom_fauxton.ttf \
@@ -352,14 +352,15 @@ fauxton.stamp: $(fauxton_src_files)
fi
install-data-local:
- for build_file in $(fauxton_build_files); do \
- if test -s $$build_file; then \
- inst_file=`echo $$build_file | sed s,^build,fauxton,`; \
- $(INSTALL) -d `dirname $(DESTDIR)$(localdatadir)/www/$$inst_file`; \
- $(INSTALL_DATA) \
- $$dist_file $(DESTDIR)$(localdatadir)/www/$$inst_file; \
- fi \
- done
+ echo hello
+ for build_file in $(fauxton_build_files); do \
+ if test -s $$build_file; then \
+ inst_file=`echo $$build_file | sed s,^build,fauxton,`; \
+ $(INSTALL) -d `dirname $(DESTDIR)$(localdatadir)/www/$$inst_file`; \
+ $(INSTALL_DATA) \
+ $$build_file $(DESTDIR)$(localdatadir)/www/$$inst_file; \
+ fi \
+ done
uninstall-local:
for build_file in $(fauxton_build_files); do \