diff options
| author | Noah Slater <nslater@apache.org> | 2013-12-14 13:43:17 +0100 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2013-12-14 13:43:17 +0100 |
| commit | 720c8da09dbbba04d1d9a7784c1fdafaf527b173 (patch) | |
| tree | c8ebfe58f194a74f81e09ee1b7b911fd9a9b9dca | |
| parent | 943df45b8a8c3dc7cd36921797080957354c3cf4 (diff) | |
| download | couchdb-720c8da09dbbba04d1d9a7784c1fdafaf527b173.tar.gz | |
Fix some build bugs
| -rw-r--r-- | share/Makefile.am | 4 | ||||
| -rw-r--r-- | share/www/fauxton/Makefile.am | 20 |
2 files changed, 1 insertions, 23 deletions
diff --git a/share/Makefile.am b/share/Makefile.am index 81530dec0..f9cdf98b0 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 diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am index b3df6e069..6aad6ec72 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 \ |