diff options
| author | Noah Slater <nslater@apache.org> | 2008-06-09 14:37:48 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2008-06-09 14:37:48 +0000 |
| commit | 2f56905cea40818e2517d6eba24765d3bdf3252d (patch) | |
| tree | a5b59ecf9f35847c6e5469d5ba05ffda4e102402 | |
| parent | d32c0e841bdd0b23229a5febbcc70141e7ea219a (diff) | |
corrected use of package tarname in instalation directories
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@665705 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4.in | 3 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index beafe3e4..58c0e281 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -12,7 +12,8 @@ dnl under the License. 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]) diff --git a/configure.ac b/configure.ac index b0c6b8ae..b65a2516 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl under the License. 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 @@ AM_CONDITIONAL([HELP2MAN], [test x${help2man_enabled} = xtrue]) 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([version_release], ["LOCAL_VERSION_RELEASE"]) 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]) |