Define PACKAGE_HOMEPAGE in configure.ac and use it in

xz and xzdec.

Use also PACKAGE_NAME instead of hardcoding "XZ Utils".
This commit is contained in:
Lasse Collin 2009-07-02 14:30:38 +03:00
parent 5cc99db5ba
commit 0a289c01ac
3 changed files with 9 additions and 4 deletions

View File

@ -23,6 +23,11 @@ AC_CONFIG_SRCDIR([src/liblzma/common/common.h])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
PACKAGE_HOMEPAGE=http://tukaani.org/xz/
AC_DEFINE_UNQUOTED([PACKAGE_HOMEPAGE], ["$PACKAGE_HOMEPAGE"],
[Define to the URL of the home page of this package.])
AC_SUBST([PACKAGE_HOMEPAGE])
echo
echo "$PACKAGE_STRING"

View File

@ -1015,7 +1015,7 @@ message_version(void)
{
// It is possible that liblzma version is different than the command
// line tool version, so print both.
printf("xz " LZMA_VERSION_STRING "\n");
printf("xz (" PACKAGE_NAME ") " LZMA_VERSION_STRING "\n");
printf("liblzma %s\n", lzma_version_string());
my_exit(E_SUCCESS);
}
@ -1166,7 +1166,7 @@ message_help(bool long_help)
printf(_("Report bugs to <%s> (in English or Finnish).\n"),
PACKAGE_BUGREPORT);
printf(_("XZ Utils home page: <http://tukaani.org/xz/>\n"));
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_HOMEPAGE);
my_exit(E_SUCCESS);
}

View File

@ -108,7 +108,7 @@ help(void)
"%" PRIu64 " MiB RAM.\n"
"\n"
"Report bugs to <" PACKAGE_BUGREPORT "> (in English or Finnish).\n"
"XZ Utils home page: <http://tukaani.org/xz/>\n",
PACKAGE_NAME " home page: <" PACKAGE_HOMEPAGE ">\n",
argv0, memlimit / (1024 * 1024));
my_exit();
}
@ -117,7 +117,7 @@ help(void)
static void lzma_attribute((noreturn))
version(void)
{
printf(TOOL_FORMAT "dec " LZMA_VERSION_STRING "\n"
printf(TOOL_FORMAT "dec (" PACKAGE_NAME ") " LZMA_VERSION_STRING "\n"
"liblzma %s\n", lzma_version_string());
my_exit();