diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | license.skip | 1 | ||||
| -rw-r--r-- | share/Makefile.am | 3 | ||||
| -rw-r--r-- | src/couchdb/Makefile.am | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 81fcf5df..f42b4b77 100644 --- a/configure.ac +++ b/configure.ac @@ -268,6 +268,7 @@ AC_CONFIG_FILES([etc/Makefile]) AC_CONFIG_FILES([share/Makefile]) AC_CONFIG_FILES([src/couchdb/couch.app.tpl]) AC_CONFIG_FILES([src/couchdb/Makefile]) +AC_CONFIG_FILES([src/couchdb/priv/Makefile]) AC_CONFIG_FILES([src/ibrowse/Makefile]) AC_CONFIG_FILES([src/mochiweb/Makefile]) AC_CONFIG_FILES([test/Makefile]) diff --git a/license.skip b/license.skip index 7ae154f5..6c58b381 100644 --- a/license.skip +++ b/license.skip @@ -1,4 +1,5 @@ aclocal.m4 +apache-couchdb-* AUTHORS autom4te.cache/* bin/couchdb.1 diff --git a/share/Makefile.am b/share/Makefile.am index ec9676df..99a05426 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -72,7 +72,7 @@ nobase_dist_localdata_DATA = \ www/_sidebar.html \ www/index.html \ www/config.html \ - www/custom_test.html \ + www/custom_test.html \ www/database.html \ www/document.html \ www/replicator.html \ @@ -109,6 +109,7 @@ nobase_dist_localdata_DATA = \ www/script/test/utf8.js \ www/script/test/jsonp.js \ www/script/test/attachments.js \ + www/script/test/attachment_names.js \ www/script/test/attachment_paths.js \ www/script/test/attachment_views.js \ www/script/test/design_paths.js \ diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am index 3c3d29dd..4b4f4ab2 100644 --- a/src/couchdb/Makefile.am +++ b/src/couchdb/Makefile.am @@ -10,6 +10,8 @@ ## License for the specific language governing permissions and limitations under ## the License. +SUBDIRS = priv + ICU_LOCAL_FLAGS = $(ICU_LOCAL_CFLAGS) $(ICU_LOCAL_LDFLAGS) # devdocdir = $(localdocdir)/developer/couchdb @@ -35,7 +37,7 @@ couchinclude_DATA = couch_db.hrl couchebin_DATA = $(compiled_files) -couchpriv_SCRIPTS = priv/couchspawnkillable +nobase_couchpriv_SCRIPTS = priv/couchspawnkillable # dist_devdoc_DATA = $(doc_base) $(doc_modules) |