From dc691c71359a11632fd0ad3882ba0cdb6d8f9cee Mon Sep 17 00:00:00 2001 From: Nathan Berkley Date: Fri, 5 Jun 2015 16:46:46 -0400 Subject: [PATCH] Fix VERSION->PACKAGE_VERSION and PACKAGE->PACKAGE_NAME so they're always defined --- src/collectdctl.c | 2 +- src/collectdmon.c | 2 +- src/daemon/collectd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/collectdctl.c b/src/collectdctl.c index 23292853..8357ce84 100644 --- a/src/collectdctl.c +++ b/src/collectdctl.c @@ -98,7 +98,7 @@ static void exit_usage (const char *name, int status) { "Hostname defaults to the local hostname if omitted (e.g., uptime/uptime).\n" "No error is returned if the specified identifier does not exist.\n" - "\n"PACKAGE" "VERSION", http://collectd.org/\n" + "\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n" , name); diff --git a/src/collectdmon.c b/src/collectdmon.c index c3f95255..6c50cf12 100644 --- a/src/collectdmon.c +++ b/src/collectdmon.c @@ -80,7 +80,7 @@ static void exit_usage (char *name) "\nFor see collectd.conf(5).\n" - "\n"PACKAGE" "VERSION", http://collectd.org/\n" + "\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n", name); exit (0); diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index 1b9c3747..a708665d 100644 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@ -270,7 +270,7 @@ static void update_kstat (void) */ static void exit_usage (int status) { - printf ("Usage: "PACKAGE" [OPTIONS]\n\n" + printf ("Usage: "PACKAGE_NAME" [OPTIONS]\n\n" "Available options:\n" " General:\n" @@ -289,7 +289,7 @@ static void exit_usage (int status) " PID file "PIDFILE"\n" " Plugin directory "PLUGINDIR"\n" " Data directory "PKGLOCALSTATEDIR"\n" - "\n"PACKAGE" "VERSION", http://collectd.org/\n" + "\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n" "by Florian octo Forster \n" "for contributions see `AUTHORS'\n"); exit (status); -- 2.11.0