Permalink
Browse files

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
  • Loading branch information...
1 parent d32c0e8 commit 2f56905cea40818e2517d6eba24765d3bdf3252d @nslater nslater committed Jun 9, 2008
Showing with 10 additions and 8 deletions.
  1. +2 −1 acinclude.m4.in
  2. +8 −7 configure.ac
View
3 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])
View
15 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])

0 comments on commit 2f56905

Please sign in to comment.