Updated Branches: refs/heads/1964-feature-fauxton-build 943df45b8 -> 720c8da09
Fix some build bugs Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/720c8da0 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/720c8da0 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/720c8da0 Branch: refs/heads/1964-feature-fauxton-build Commit: 720c8da09dbbba04d1d9a7784c1fdafaf527b173 Parents: 943df45 Author: Noah Slater <[email protected]> Authored: Sat Dec 14 13:43:17 2013 +0100 Committer: Noah Slater <[email protected]> Committed: Sat Dec 14 13:43:17 2013 +0100 ---------------------------------------------------------------------- share/Makefile.am | 4 +--- share/www/fauxton/Makefile.am | 20 -------------------- 2 files changed, 1 insertion(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/720c8da0/share/Makefile.am ---------------------------------------------------------------------- diff --git a/share/Makefile.am b/share/Makefile.am index 81530de..f9cdf98 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -10,9 +10,7 @@ ## License for the specific language governing permissions and limitations under ## the License. -SUBDIRS = doc - -SUBDIRS = www +SUBDIRS = doc www JS_FILE = server/main.js http://git-wip-us.apache.org/repos/asf/couchdb/blob/720c8da0/share/www/fauxton/Makefile.am ---------------------------------------------------------------------- diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am index b3df6e0..6aad6ec 100644 --- a/share/www/fauxton/Makefile.am +++ b/share/www/fauxton/Makefile.am @@ -10,23 +10,3 @@ ## License for the specific language governing permissions and limitations under ## the License. -nobase_dist_localdata_DATA = \ - www/fauxton/css/index.css \ - www/fauxton/img/couchdb-site.png \ - www/fauxton/img/couchdblogo.png \ - www/fauxton/img/fontawesome-webfont.eot \ - www/fauxton/img/fontawesome-webfont.svg \ - www/fauxton/img/fontawesome-webfont.ttf \ - www/fauxton/img/fontawesome-webfont.woff \ - www/fauxton/img/FontAwesome.otf \ - www/fauxton/img/fontcustom_fauxton.eot \ - www/fauxton/img/fontcustom_fauxton.svg \ - www/fauxton/img/fontcustom_fauxton.ttf \ - www/fauxton/img/fontcustom_fauxton.woff \ - www/fauxton/img/glyphicons-halflings-white.png \ - www/fauxton/img/glyphicons-halflings.png \ - www/fauxton/img/linen.png \ - www/fauxton/img/loader.gif \ - www/fauxton/img/minilogo.png \ - www/fauxton/index.html \ - www/fauxton/js/require.js \
