summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--etc/couchdb/Makefile.am4
-rw-r--r--share/Makefile.am2
-rw-r--r--src/couchdb/Makefile.am2
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