From e46577ffe5b805e857d3de85530a4c6b8a10e83e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 23 Apr 2010 12:12:47 -0700 Subject: [PATCH] core: rearrange version macros a bit --- src/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 6bb112171..1d0ab5328 100644 --- a/src/main.c +++ b/src/main.c @@ -53,6 +53,10 @@ #include "nm-vpn-manager.h" #include "nm-logging.h" +#if !defined(NM_DIST_VERSION) +# define NM_DIST_VERSION VERSION +#endif + #define NM_DEFAULT_PID_FILE LOCALSTATEDIR"/run/NetworkManager.pid" #define NM_DEFAULT_SYSTEM_CONF_FILE SYSCONFDIR"/NetworkManager/NetworkManager.conf" #define NM_OLD_SYSTEM_CONF_FILE SYSCONFDIR"/NetworkManager/nm-system-settings.conf" @@ -616,10 +620,7 @@ main (int argc, char *argv[]) nm_logging_start (become_daemon); -#if !defined(NM_DIST_VERSION) -# define NM_DIST_VERSION VERSION -#endif - nm_log_info (LOGD_CORE, "NetworkManager-" NM_DIST_VERSION " is starting..."); + nm_log_info (LOGD_CORE, "NetworkManager (version " NM_DIST_VERSION ") is starting..."); success = FALSE; main_loop = g_main_loop_new (NULL, FALSE);