Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed abspath from makefiles

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@667971 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 081daf1250c079efc38a6be9c04984718d441a1f 1 parent cd9dd26
@nslater nslater authored
Showing with 12 additions and 24 deletions.
  1. +7 −13 etc/Makefile.am
  2. +5 −11 etc/couchdb/Makefile.am
View
20 etc/Makefile.am
@@ -30,12 +30,6 @@ CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA)
transform = @program_transform_name@
couchdb_command_name = `echo couchdb | sed '$(transform)'`
-abs_bindir = $(abspath $(bindir))
-abs_localstatedir = $(abspath $(localstatedir))
-abs_sysconfdir = $(abspath $(sysconfdir))
-abs_pkgconfdir = $(abspath $(pkgconfdir))
-abs_erlangbindir = $(abspath $(erlangbindir))
-
default/couchdb: default/couchdb.tpl
if test "$(mkdir_p)"; then \
$(mkdir_p) default; \
@@ -45,9 +39,9 @@ default/couchdb: default/couchdb.tpl
fi \
fi
sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
- -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
- -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
- -e "s|%localstatedir%|$(abs_localstatedir)|" \
+ -e "s|%pkgconfdir%|$(pkgconfdir)|g" \
+ -e "s|%sysconfdir%|$(sysconfdir)|" \
+ -e "s|%localstatedir%|$(localstatedir)|" \
< $< > $@
init/couchdb: init/couchdb.tpl
@@ -59,9 +53,9 @@ init/couchdb: init/couchdb.tpl
fi \
fi
sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
- -e "s|%bindir%|$(abs_bindir)|" \
- -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
- -e "s|%erlangbindir%|$(abs_erlangbindir)|" \
+ -e "s|%bindir%|$(bindir)|" \
+ -e "s|%sysconfdir%|$(sysconfdir)|" \
+ -e "s|%erlangbindir%|$(erlangbindir)|" \
-e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
< $< > $@
@@ -77,7 +71,7 @@ launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl
fi \
fi
sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
- -e "s|%bindir%|$(abs_bindir)|" \
+ -e "s|%bindir%|$(bindir)|" \
-e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
< $< > $@
View
16 etc/couchdb/Makefile.am
@@ -19,18 +19,12 @@ couchjs_command_name = `echo couchjs | sed '$(transform)'`
couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
-abs_bindir = $(abspath $(bindir))
-abs_pkgdatadir = $(abspath $(pkgdatadir))
-abs_pkgconfdir = $(abspath $(pkgconfdir))
-abs_pkgstatelibdir = $(abspath $(pkgstatelibdir))
-abs_pkgstatelogdir = $(abspath $(pkgstatelogdir))
-
couch.ini: couch.ini.tpl
- sed -e "s|%bindir%|$(abs_bindir)|g" \
- -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
- -e "s|%pkgdatadir%|$(abs_pkgdatadir)|g" \
- -e "s|%pkgstatelibdir%|$(abs_pkgstatelibdir)|g" \
- -e "s|%pkgstatelogdir%|$(abs_pkgstatelogdir)|g" \
+ 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|%couchprivlibdir%|$(couchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
Please sign in to comment.
Something went wrong with that request. Please try again.