You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2008/06/09 16:37:48 UTC
svn commit: r665705 - in /incubator/couchdb/trunk: acinclude.m4.in
configure.ac
Author: nslater
Date: Mon Jun 9 07:37:48 2008
New Revision: 665705
URL: http://svn.apache.org/viewvc?rev=665705&view=rev
Log:
corrected use of package tarname in instalation directories
Modified:
incubator/couchdb/trunk/acinclude.m4.in
incubator/couchdb/trunk/configure.ac
Modified: incubator/couchdb/trunk/acinclude.m4.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/acinclude.m4.in?rev=665705&r1=665704&r2=665705&view=diff
==============================================================================
--- incubator/couchdb/trunk/acinclude.m4.in (original)
+++ incubator/couchdb/trunk/acinclude.m4.in Mon Jun 9 07:37:48 2008
@@ -12,7 +12,8 @@
m4_define([LOCAL_PACKAGE_AUTHOR_NAME], [Damien Katz])
m4_define([LOCAL_PACKAGE_AUTHOR_ADDRESS], [damien@apache.org])
-m4_define([LOCAL_PACKAGE_IDENTIFIER], [apache-couchdb])
+m4_define([LOCAL_PACKAGE_IDENTIFIER], [couchdb])
+m4_define([LOCAL_PACKAGE_TARNAME], [apache-couchdb])
m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
m4_define([LOCAL_VERSION_MAJOR], [0])
Modified: incubator/couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/configure.ac?rev=665705&r1=665704&r2=665705&view=diff
==============================================================================
--- incubator/couchdb/trunk/configure.ac (original)
+++ incubator/couchdb/trunk/configure.ac Mon Jun 9 07:37:48 2008
@@ -12,7 +12,7 @@
m4_include([m4/ac_check_icu.m4])
-AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [], [LOCAL_PACKAGE_IDENTIFIER])
+AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [], [LOCAL_PACKAGE_TARNAME])
AC_PREREQ([2.59])
@@ -199,6 +199,7 @@
AC_SUBST([package_author_name], ["LOCAL_PACKAGE_AUTHOR_NAME"])
AC_SUBST([package_author_address], ["LOCAL_PACKAGE_AUTHOR_ADDRESS"])
AC_SUBST([package_identifier], ["LOCAL_PACKAGE_IDENTIFIER"])
+AC_SUBST([package_tarname], ["LOCAL_PACKAGE_TARNAME"])
AC_SUBST([package_name], ["LOCAL_PACKAGE_NAME"])
AC_SUBST([version], ["LOCAL_VERSION"])
@@ -210,12 +211,12 @@
AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
-AC_SUBST([pkgconfdir], [${sysconfdir}/${PACKAGE_TARNAME}])
-AC_SUBST([pkgdatadir], [${datadir}/${PACKAGE_TARNAME}])
-AC_SUBST([pkgdocdir], [${datadir}/doc/${PACKAGE_TARNAME}])
-AC_SUBST([pkglibdir], [${libdir}/${PACKAGE_TARNAME}])
-AC_SUBST([pkgstatelibdir], [${localstatedir}/lib/${PACKAGE_TARNAME}])
-AC_SUBST([pkgstatelogdir], [${localstatedir}/log/${PACKAGE_TARNAME}])
+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])