2006-02-02 Robert Love <rml@novell.com>

	* src/Makefile.am: If we aren't going to create the run directory at,
	  uh, run-time, create it during install.  Then users just doing
	  'make install' are cool, too.  While we are here, create the
	  dispatcher.d directory, too.
	* src/nm-device-802-11-wireless.c: Let the Makefile define and pass in
	  the exact run directory.
	* Makefile.am: Install nm-applet.desktop.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1430 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index f8d9cb4..deaa91e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-02  Robert Love  <rml@novell.com>
+
+       * src/Makefile.am: If we aren't going to create the run directory at,
+         uh, run-time, create it during install.  Then users just doing
+         'make install' are cool, too.  While we are here, create the
+         dispatcher.d directory, too.
+       * src/nm-device-802-11-wireless.c: Let the Makefile define and pass in
+         the exact run directory.
+       * Makefile.am: Install nm-applet.desktop.
+
 2006-02-02  Robert Love  <rml@novell.com>
 
        * src/NetworkManagerAP.c: Add 'broadcast' property to the NMAccessPoint

diff --git a/Makefile.am b/Makefile.am
index 7f7236c..4557847 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,5 +21,7 @@ EXTRA_DIST =                          \
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig
-
 pkgconfig_DATA = NetworkManager.pc
+
+autostartdir = $(datadir)/autostart
+autostart_DATA = nm-applet.desktop

diff --git a/src/Makefile.am b/src/Makefile.am
index 3d92bb9..036af07 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,12 @@ NetworkManager_SOURCES =                             \
                wpa_ctrl.c                              \
                wpa_ctrl.h
 
+rundir=$(localstatedir)/run/NetworkManager
+dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
+install-data-hook:
+          $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
+          $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
+
 NetworkManager_CPPFLAGS =                                                      \
        $(DBUS_CFLAGS)                                                                  \
        $(GTHREAD_CFLAGS)                                                               \
@@ -77,6 +83,7 @@ NetworkManager_CPPFLAGS =                                                     \
        -DDATADIR=\"$(datadir)\"                                                        \
        -DSYSCONFDIR=\"$(sysconfdir)\"                                  \
        -DLOCALSTATEDIR=\"$(localstatedir)\"                            \
+       -DNM_RUN_DIR=\"$(rundir)\"                                              \
        -DARP_DEBUG
 
 
@@ -93,6 +100,8 @@ NetworkManager_LDADD =                                                       \
                        ./backends/libnmbackend.la                      \
                        $(top_builddir)/libnm-util/libnm-util.la
 
+
+
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = NetworkManager.conf
 

diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 9bb14e5..4084120 100644 (file)
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2402,14 +2402,13 @@ supplicant_exec (NMDevice80211Wireless *self)
 static gboolean
 supplicant_interface_init (NMDevice80211Wireless *self)
 {
-#define NM_WPA_CTRL_IFACE_DIR          LOCALSTATEDIR"/run/NetworkManager"
        struct wpa_ctrl *       ctrl;
        char *                  socket_path;
        const char *            iface = nm_device_get_iface (NM_DEVICE (self));
        gboolean                        success = FALSE;
        int                             tries = 0;
 
-       if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_WPA_CTRL_IFACE_DIR)))
+       if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_RUN_DIR)))
                goto exit;
 
        /* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
@@ -2424,7 +2423,7 @@ supplicant_interface_init (NMDevice80211Wireless *self)
         */
        socket_path = supplicant_get_device_socket_path (self);
        while (!self->priv->sup_ctrl && (tries++ < 10))
-               self->priv->sup_ctrl = wpa_ctrl_open (socket_path, NM_WPA_CTRL_IFACE_DIR);
+               self->priv->sup_ctrl = wpa_ctrl_open (socket_path, NM_RUN_DIR);
        g_free (socket_path);
        if (!self->priv->sup_ctrl)
        {