couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r662542 - in /incubator/couchdb/branches/runtimeconfig/etc: Makefile.am couchdb/Makefile.am
Date Mon, 02 Jun 2008 20:02:30 GMT
Author: nslater
Date: Mon Jun  2 13:02:30 2008
New Revision: 662542

URL: http://svn.apache.org/viewvc?rev=662542&view=rev
Log:
fixed incorrect abspath implementation in makefiles

Modified:
    incubator/couchdb/branches/runtimeconfig/etc/Makefile.am
    incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am

Modified: incubator/couchdb/branches/runtimeconfig/etc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/Makefile.am?rev=662542&r1=662541&r2=662542&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/Makefile.am Mon Jun  2 13:02:30 2008
@@ -32,6 +32,12 @@
 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; \
@@ -41,10 +47,9 @@
 	    fi \
 	fi
 	sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	       -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	       -e "s|%sysconfdir%|@sysconfdir@|" \
-	       -e "s|%localstatedir%|@localstatedir@|" \
-	       -e "s|([^:])/+|\1/|g" \
+	       -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
+	       -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
+	       -e "s|%localstatedir%|$(abs_localstatedir)|" \
 	< $< > $@
 
 init/couchdb: init/couchdb.tpl
@@ -56,11 +61,10 @@
 	    fi \
 	fi
 	sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	       -e "s|%bindir%|@bindir@|" \
-	       -e "s|%sysconfdir%|@sysconfdir@|" \
-	       -e "s|%erlangbindir%|@erlangbindir@|" \
+	       -e "s|%bindir%|$(abs_bindir)|" \
+	       -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
+	       -e "s|%erlangbindir%|$(abs_erlangbindir)|" \
 	       -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
-	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@
 
 logrotate.d/couchdb: logrotate.d/couchdb.tpl
@@ -75,9 +79,8 @@
 	    fi \
 	fi
 	sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	       -e "s|%bindir%|@bindir@|" \
+	       -e "s|%bindir%|$(abs_bindir)|" \
 	       -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
-	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@
 
 install-data-hook:

Modified: incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am?rev=662542&r1=662541&r2=662542&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am Mon Jun  2 13:02:30 2008
@@ -21,13 +21,18 @@
 
 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 -r -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" \
+	sed -r -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" \
 	       -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
 	       -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
-	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@



Mime
View raw message