colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: rearrange version macros a bit

Browse Source
This commit is contained in:
Dan Williams
2010-04-23 12:12:47 -07:00
parent b0548425d7
commit e46577ffe5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@@ -53,6 +53,10 @@
#include "nm-vpn-manager.h" #include "nm-vpn-manager.h"
#include "nm-logging.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_PID_FILE LOCALSTATEDIR"/run/NetworkManager.pid"
#define NM_DEFAULT_SYSTEM_CONF_FILE SYSCONFDIR"/NetworkManager/NetworkManager.conf" #define NM_DEFAULT_SYSTEM_CONF_FILE SYSCONFDIR"/NetworkManager/NetworkManager.conf"
#define NM_OLD_SYSTEM_CONF_FILE SYSCONFDIR"/NetworkManager/nm-system-settings.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); nm_logging_start (become_daemon);
#if !defined(NM_DIST_VERSION) nm_log_info (LOGD_CORE, "NetworkManager (version " NM_DIST_VERSION ") is starting...");
# define NM_DIST_VERSION VERSION
#endif
nm_log_info (LOGD_CORE, "NetworkManager-" NM_DIST_VERSION " is starting...");
success = FALSE; success = FALSE;
main_loop = g_main_loop_new (NULL, FALSE); main_loop = g_main_loop_new (NULL, FALSE);