summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/Makefile.am12
-rw-r--r--bin/couchdb.tpl.in10
-rw-r--r--bin/couchjs.tpl.in2
-rw-r--r--configure.ac18
-rw-r--r--etc/Makefile.am6
-rw-r--r--etc/couchdb/Makefile.am10
-rw-r--r--etc/couchdb/couch.ini.tpl.in8
-rw-r--r--etc/couchdb/couch_httpd.conf.tpl.in8
-rw-r--r--etc/default/couchdb.tpl.in2
-rw-r--r--etc/logrotate.d/couchdb.tpl.in2
-rw-r--r--src/couchdb/Makefile.am6
-rw-r--r--src/mochiweb/Makefile.am2
-rw-r--r--var/Makefile.am8
13 files changed, 47 insertions, 47 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 92ab95cd6..1777ce102 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -27,11 +27,11 @@ couchdb: couchdb.tpl
-e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-e "s|%AWK%|$(AWK)|g" \
-e "s|%bindir%|@bindir@|g" \
- -e "s|%erlangbindir%|@erlangbindir@|g" \
- -e "s|%erlanglibdir%|@erlanglibdir@|g" \
- -e "s|%pkgconfdir%|@pkgconfdir@|g" \
- -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
- -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
+ -e "s|%localerlangbindir%|@localerlangbindir@|g" \
+ -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \
+ -e "s|%localconfdir%|@localconfdir@|g" \
+ -e "s|%localstatelogdir%|@localstatelogdir@|g" \
+ -e "s|%localstatelibdir%|@localstatelibdir@|g" \
-e "s|%localstatedir%|@localstatedir@|g" \
-e "s|%bug_uri%|@bug_uri@|g" \
-e "s|%package_author_address%|@package_author_address@|g" \
@@ -43,7 +43,7 @@ couchdb: couchdb.tpl
chmod +x $@
couchjs: couchjs.tpl
- sed -e "s|%libbindir%|@libbindir@|g" \
+ sed -e "s|%locallibbindir%|@locallibbindir@|g" \
-e "s|%bug_uri%|@bug_uri@|g" \
-e "s|%package_author_address%|@package_author_address@|g" \
-e "s|%package_author_name%|@package_author_name@|g" \
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index c55499c02..77409ae07 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -25,10 +25,10 @@ RECURSED_BOOLEAN=false
RESPAWN_TIMEOUT=0
-LIB_DIRECTORY=%pkgstatelibdir%
-LOG_DIRECTORY=%pkgstatelogdir%
+LIB_DIRECTORY=%localstatelibdir%
+LOG_DIRECTORY=%localstatelogdir%
-INI_FILE=%pkgconfdir%/couch.ini
+INI_FILE=%localconfdir%/couch.ini
PID_FILE=%localstatedir%/run/couchdb.pid
STDOUT_FILE=couchdb.stdout
@@ -205,8 +205,8 @@ start_couchdb () {
fi
command="`%ICU_CONFIG% --invoke` \
%ERL% $interactive_option -smp auto -sasl errlog_type error \
- -pa %erlanglibdir%/couch-%version%/ebin \
- %erlanglibdir%/mochiweb-r76/ebin \
+ -pa %localerlanglibdir%/couch-%version%/ebin \
+ %localerlanglibdir%/mochiweb-r76/ebin \
-eval \"application:load(inets)\" \
-eval \"application:load(crypto)\" \
-eval \"application:load(couch)\" \
diff --git a/bin/couchjs.tpl.in b/bin/couchjs.tpl.in
index 3e47d6b6a..e01a2bb1d 100644
--- a/bin/couchjs.tpl.in
+++ b/bin/couchjs.tpl.in
@@ -65,7 +65,7 @@ display_error () {
}
run_couchjs () {
- exec %libbindir%/%couchjs_command_name% $@
+ exec %locallibbindir%/%couchjs_command_name% $@
}
parse_script_option_list () {
diff --git a/configure.ac b/configure.ac
index 7db02883d..18812f38c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,15 +211,15 @@ AC_SUBST([version_release], ["LOCAL_VERSION_RELEASE"])
AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
-AC_SUBST([pkgconfdir], [${sysconfdir}/${package_identifier}])
-AC_SUBST([pkgdatadir], [${datadir}/${package_identifier}])
-AC_SUBST([pkgdocdir], [${datadir}/doc/${package_identifier}])
-AC_SUBST([pkglibdir], [${libdir}/${package_identifier}])
-AC_SUBST([pkgstatelibdir], [${localstatedir}/lib/${package_identifier}])
-AC_SUBST([pkgstatelogdir], [${localstatedir}/log/${package_identifier}])
-AC_SUBST([libbindir], [${pkglibdir}/bin])
-AC_SUBST([erlangbindir], [${pkglibdir}/erlang/bin])
-AC_SUBST([erlanglibdir], [${pkglibdir}/erlang/lib])
+AC_SUBST([localconfdir], [${sysconfdir}/${package_identifier}])
+AC_SUBST([localdatadir], [${datadir}/${package_identifier}])
+AC_SUBST([localdocdir], [${datadir}/doc/${package_identifier}])
+AC_SUBST([locallibdir], [${libdir}/${package_identifier}])
+AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
+AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
+AC_SUBST([locallibbindir], [${locallibdir}/bin])
+AC_SUBST([localerlangbindir], [${locallibdir}/erlang/bin])
+AC_SUBST([localerlanglibdir], [${locallibdir}/erlang/lib])
AC_REVISION([LOCAL_VERSION])
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 0126eb303..ec62fd195 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -39,7 +39,7 @@ default/couchdb: default/couchdb.tpl
fi \
fi
sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
- -e "s|%pkgconfdir%|$(pkgconfdir)|g" \
+ -e "s|%localconfdir%|$(localconfdir)|g" \
-e "s|%sysconfdir%|$(sysconfdir)|" \
-e "s|%localstatedir%|$(localstatedir)|" \
< $< > $@
@@ -55,12 +55,12 @@ init/couchdb: init/couchdb.tpl
sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-e "s|%bindir%|$(bindir)|" \
-e "s|%sysconfdir%|$(sysconfdir)|" \
- -e "s|%erlangbindir%|$(erlangbindir)|" \
+ -e "s|%localerlangbindir%|$(localerlangbindir)|" \
-e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
< $< > $@
logrotate.d/couchdb: logrotate.d/couchdb.tpl
- sed -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" < $< > $@
+ sed -e "s|%localstatelogdir%|@localstatelogdir@|g" < $< > $@
launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl
if test "$(mkdir_p)"; then \
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index dc8493546..d5356ceb4 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -17,14 +17,14 @@ CLEANFILES = $(pkgconf_DATA)
transform = @program_transform_name@
couchjs_command_name = `echo couchjs | sed '$(transform)'`
-couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
+couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
couch.ini: couch.ini.tpl
sed -e "s|%bindir%|$(bindir)|g" \
- -e "s|%pkgconfdir%|$(pkgconfdir)|g" \
- -e "s|%pkgdatadir%|$(pkgdatadir)|g" \
- -e "s|%pkgstatelibdir%|$(pkgstatelibdir)|g" \
- -e "s|%pkgstatelogdir%|$(pkgstatelogdir)|g" \
+ -e "s|%localconfdir%|$(localconfdir)|g" \
+ -e "s|%localdatadir%|$(localdatadir)|g" \
+ -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
+ -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
-e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
diff --git a/etc/couchdb/couch.ini.tpl.in b/etc/couchdb/couch.ini.tpl.in
index 555ea3daf..7e155fab7 100644
--- a/etc/couchdb/couch.ini.tpl.in
+++ b/etc/couchdb/couch.ini.tpl.in
@@ -4,15 +4,15 @@
ConsoleStartupMsg=Apache CouchDB is starting.
-DbRootDir=%pkgstatelibdir%
+DbRootDir=%localstatelibdir%
Port=5984
BindAddress=127.0.0.1
-DocumentRoot=%pkgdatadir%/www
+DocumentRoot=%localdatadir%/www
-LogFile=%pkgstatelogdir%/couch.log
+LogFile=%localstatelogdir%/couch.log
UtilDriverDir=%couchprivlibdir%
@@ -20,4 +20,4 @@ LogLevel=info
[Couch Query Servers]
-javascript=%bindir%/%couchjs_command_name% %pkgdatadir%/server/main.js
+javascript=%bindir%/%couchjs_command_name% %localdatadir%/server/main.js
diff --git a/etc/couchdb/couch_httpd.conf.tpl.in b/etc/couchdb/couch_httpd.conf.tpl.in
index e4d27493c..19d6d10ce 100644
--- a/etc/couchdb/couch_httpd.conf.tpl.in
+++ b/etc/couchdb/couch_httpd.conf.tpl.in
@@ -5,7 +5,7 @@ Port 5984
ServerName localhost
SocketType ip_comm
Modules mod_couch mod_get mod_log
-ServerRoot %pkgconfdir%
-DocumentRoot %pkgdatadir%/www
-ErrorLog %pkgstatelogdir%/http_error.log
-TransferLog %pkgstatelogdir%/http_access.log
+ServerRoot %localconfdir%
+DocumentRoot %localdatadir%/www
+ErrorLog %localstatelogdir%/http_error.log
+TransferLog %localstatelogdir%/http_access.log
diff --git a/etc/default/couchdb.tpl.in b/etc/default/couchdb.tpl.in
index fadef1a73..40c7b6e54 100644
--- a/etc/default/couchdb.tpl.in
+++ b/etc/default/couchdb.tpl.in
@@ -3,7 +3,7 @@
# Sourced by init script for configuration.
COUCHDB_USER=couchdb
-COUCHDB_INI_FILE=%pkgconfdir%/couch.ini
+COUCHDB_INI_FILE=%localconfdir%/couch.ini
COUCHDB_PID_FILE=%localstatedir%/run/couchdb.pid
COUCHDB_STDOUT_FILE=/dev/null
COUCHDB_STDERR_FILE=/dev/null
diff --git a/etc/logrotate.d/couchdb.tpl.in b/etc/logrotate.d/couchdb.tpl.in
index 9bef5b2f4..0bb07e137 100644
--- a/etc/logrotate.d/couchdb.tpl.in
+++ b/etc/logrotate.d/couchdb.tpl.in
@@ -1,4 +1,4 @@
-%pkgstatelogdir%/*.log {
+%localstatelogdir%/*.log {
weekly
rotate 10
copytruncate
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index 283eb4bb7..47795c1d8 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -12,7 +12,7 @@
ICU_LOCAL_FLAGS = $(ICU_LOCAL_CFLAGS) $(ICU_LOCAL_LDFLAGS)
-couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
+couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
couchprivlib_LTLIBRARIES = couch_erl_driver.la
couch_erl_driver_la_SOURCES = couch_erl_driver.c
@@ -23,8 +23,8 @@ couch_erl_driver_la_LIBADD = -licuuc -licudata -licui18n
libbin_PROGRAMS = couchjs
couchjs_SOURCES = couch_js.c
-couchebindir = $(erlanglibdir)/couch-$(version)/ebin
-couchincludedir = $(erlanglibdir)/couch-$(version)/include
+couchebindir = $(localerlanglibdir)/couch-$(version)/ebin
+couchincludedir = $(localerlanglibdir)/couch-$(version)/include
couch_file_collection = \
cjson.erl \
diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am
index ea1d8f072..851094235 100644
--- a/src/mochiweb/Makefile.am
+++ b/src/mochiweb/Makefile.am
@@ -10,7 +10,7 @@
## License for the specific language governing permissions and limitations under
## the License.
-mochiwebebindir = $(erlanglibdir)/mochiweb-r76/ebin
+mochiwebebindir = $(localerlanglibdir)/mochiweb-r76/ebin
mochiweb_file_collection = \
mochifmt.erl \
diff --git a/var/Makefile.am b/var/Makefile.am
index 413ef7d21..803ddce8a 100644
--- a/var/Makefile.am
+++ b/var/Makefile.am
@@ -12,12 +12,12 @@
install-data-hook:
if test ! "$(mkdir_p)" = ""; then \
- $(mkdir_p) "$(DESTDIR)$(pkgstatelibdir)"; \
- $(mkdir_p) "$(DESTDIR)$(pkgstatelogdir)"; \
+ $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \
+ $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \
$(mkdir_p) "$(DESTDIR)$(localstatedir)/run"; \
else \
echo "WARNING: You may have to create these directories by hand."; \
- mkdir -p "$(DESTDIR)$(pkgstatelibdir)"; \
- mkdir -p "$(DESTDIR)$(pkgstatelogdir)"; \
+ mkdir -p "$(DESTDIR)$(localstatelibdir)"; \
+ mkdir -p "$(DESTDIR)$(localstatelogdir)"; \
mkdir -p "$(DESTDIR)$(localstatedir)/run"; \
fi
View Lorry Controller Status