core: rearrange version macros a bit
authorDan Williams <dcbw@redhat.com>
Fri, 23 Apr 2010 19:12:47 +0000 (12:12 -0700)
committerDan Williams <dcbw@redhat.com>
Fri, 23 Apr 2010 19:12:47 +0000 (12:12 -0700)
src/main.c

index 6bb1121..1d0ab53 100644 (file)
 #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);