diff options
| author | Noah Slater <nslater@apache.org> | 2008-06-16 16:49:14 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2008-06-16 16:49:14 +0000 |
| commit | 762dc6b37093ef85a7793671a8725b80d0f00870 (patch) | |
| tree | aa6430806501f2c47c9b9d36914bc99ba2e52c41 | |
| parent | b74e6688a21a0b412ed4b76349260e962ca755e7 (diff) | |
renamed directory variables, stage two
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@668234 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | etc/couchdb/Makefile.am | 4 | ||||
| -rw-r--r-- | share/Makefile.am | 2 | ||||
| -rw-r--r-- | src/couchdb/Makefile.am | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index f836141b..8b555ce2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,9 +12,9 @@ SUBDIRS = bin etc src share var -pkgdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz +localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz -DISTCLEANFILES = $(pkgdoc_DATA) +DISTCLEANFILES = $(localdoc_DATA) EXTRA_DIST = AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index d5356ceb..9f686780 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -10,9 +10,9 @@ ## License for the specific language governing permissions and limitations ## under the License. -pkgconf_DATA = couch.ini +localconf_DATA = couch.ini -CLEANFILES = $(pkgconf_DATA) +CLEANFILES = $(localconf_DATA) transform = @program_transform_name@ couchjs_command_name = `echo couchjs | sed '$(transform)'` diff --git a/share/Makefile.am b/share/Makefile.am index 235af541..e98526a9 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -10,7 +10,7 @@ ## License for the specific language governing permissions and limitations ## under the License. -nobase_dist_pkgdata_DATA = \ +nobase_dist_localdata_DATA = \ server/main.js \ www/browse/_compact_database.html \ www/browse/_create_database.html \ diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am index 47795c1d..ff5827ef 100644 --- a/src/couchdb/Makefile.am +++ b/src/couchdb/Makefile.am @@ -20,7 +20,7 @@ couch_erl_driver_la_LDFLAGS = -module -avoid-version $(ICU_LOCAL_FLAGS) couch_erl_driver_la_CFLAGS = $(ICU_LOCAL_FLAGS) couch_erl_driver_la_LIBADD = -licuuc -licudata -licui18n -libbin_PROGRAMS = couchjs +locallibbin_PROGRAMS = couchjs couchjs_SOURCES = couch_js.c couchebindir = $(localerlanglibdir)/couch-$(version)/ebin |