diff options
| author | Noah Slater <nslater@apache.org> | 2013-12-16 18:31:18 +0100 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2013-12-16 18:31:18 +0100 |
| commit | 730f6e684d74c2b68db88abf0dc2a0a7003ad2fa (patch) | |
| tree | a5604da6659e29e2f649e516851f35cbd77ed3ba | |
| parent | 864b69c07e58709c90f0b46c58a8859070690b82 (diff) | |
| download | couchdb-1964-feature-fauxton-build.tar.gz | |
Switch to using build-aux/missing1964-feature-fauxton-build
| -rw-r--r-- | share/www/fauxton/Makefile.am | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am index de7af3b05..7d108a76d 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 \ |