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:44 UTC
[10/10] git commit: updated refs/heads/1964-feature-fauxton-build to
730f6e6
Switch to using build-aux/missing
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/730f6e68
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/730f6e68
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/730f6e68
Branch: refs/heads/1964-feature-fauxton-build
Commit: 730f6e684d74c2b68db88abf0dc2a0a7003ad2fa
Parents: 864b69c
Author: Noah Slater <ns...@apache.org>
Authored: Mon Dec 16 18:31:18 2013 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Mon Dec 16 18:31:18 2013 +0100
----------------------------------------------------------------------
share/www/fauxton/Makefile.am | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/730f6e68/share/www/fauxton/Makefile.am
----------------------------------------------------------------------
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am
index de7af3b..7d108a7 100644
--- a/share/www/fauxton/Makefile.am
+++ b/share/www/fauxton/Makefile.am
@@ -328,9 +328,9 @@ $(fauxton_build_files): fauxton.stamp
# @@ how is vpath handled?
# @@ need to handle missing grunt properly
-# @@ ./src/bin/grunt: line 18: ./src/bin/../node_modules/.bin/grunt: No such file or directory
-# @@ build-aux script. also conditional build section above
-# @@ also, why is it trying to build fauxton if we ship the build dir?
+# @@ conditional build section above?
+# @@ why is it trying to build fauxton if we ship the build dir?
+# @@ BUILT_SOURCES?
# @@ same question applies to the docs! very strange
fauxton.stamp: $(fauxton_src_files)
@@ -338,7 +338,9 @@ fauxton.stamp: $(fauxton_src_files)
if mkdir fauxton.lock 2>/dev/null; then \
rm -f fauxton.tmp; \
touch fauxton.tmp; \
- $(srcdir)/src/bin/grunt --gruntfile $(srcdir)/src/Gruntfile.js couchdb; \
+ $(top_srcdir)/build-aux/missing \
+ $(srcdir)/src/bin/grunt \
+ --gruntfile $(srcdir)/src/Gruntfile.js couchdb; \
mv -f fauxton.tmp $@; \
rmdir fauxton.lock; \
else \
@@ -367,9 +369,6 @@ uninstall-local:
fi \
done
-
-# @@ clean dist dir
-
DISTCLEANFILES = \
fauxton.stamp \
src/app/initialize.js \