2006-10-11 Tambet Ingo <tambet@ximian.com>SoC_2006

	* dialup-services/Makefile: Remove from CVS.

	* dialup-services/Makefile.am: New file.

	* src/backends/NetworkManager*: Fix includes.

	* src/dialup/ppp/nm-pppd-plugin.c: Ditto.

	* src/dialup/ppp/nm-ppp-service.c: Ditto.

	* gnome/applet/applet.c (nma_class_init): Append our icon directory to
	theme search path.
	Fix a typo.

	* gnome/applet/Makefile.am: Use the correct path to icons.

	* gnome/vpn-properties/Makefile.am: Ditto.

	* gnome/dialup-properties/pppoe/Makefile.am: Ditto.

	* gnome/dialup-properties/modem/Makefile.am: Ditto.

	* gnome/dialup-properties/btgprs/Makefile.am: Ditto.

	* gnome/dialup-properties/Makefile.am: Ditto.

	* gnome/dialup-auth/pppoe/Makefile.am: Ditto.

	* gnome/dialup-auth/ppp/Makefile.am: Ditto.

	* configure.in: Remove local hacks and replace them with AS_AC_EXPAND.
	Expand all variables that are used in .in files.

	* autogen.sh: Include . to aclocal's search path to get
	as-ac-expand.m4 included.

	* as-ac-expand.m4: New file.


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

21 files changed, 127 insertions, 475 deletions

diff --git a/ChangeLog b/ChangeLog
index 07ea76e258..6422c42b7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2006-10-11  Tambet Ingo  <tambet@ximian.com>
+
+	* dialup-services/Makefile: Remove from CVS.
+
+	* dialup-services/Makefile.am: New file.
+
+	* src/backends/NetworkManager*: Fix includes.
+
+	* src/dialup/ppp/nm-pppd-plugin.c: Ditto.
+
+	* src/dialup/ppp/nm-ppp-service.c: Ditto.
+
+	* gnome/applet/applet.c (nma_class_init): Append our icon directory to
+	theme search path.
+	Fix a typo.
+
+	* gnome/applet/Makefile.am: Use the correct path to icons.
+
+	* gnome/vpn-properties/Makefile.am: Ditto.
+
+	* gnome/dialup-properties/pppoe/Makefile.am: Ditto.
+
+	* gnome/dialup-properties/modem/Makefile.am: Ditto.
+
+	* gnome/dialup-properties/btgprs/Makefile.am: Ditto.
+
+	* gnome/dialup-properties/Makefile.am: Ditto.
+
+	* gnome/dialup-auth/pppoe/Makefile.am: Ditto.
+
+	* gnome/dialup-auth/ppp/Makefile.am: Ditto.
+
+	* configure.in: Remove local hacks and replace them with AS_AC_EXPAND.
+	Expand all variables that are used in .in files.
+
+	* autogen.sh: Include . to aclocal's search path to get
+	as-ac-expand.m4 included.
+
+	* as-ac-expand.m4: New file.
+
 2006-08-25  Tim Niemueller  <tim@niemueller.de>
 
 	* gnome/dialup-auth/pppoe/*: Authentication app for
diff --git a/as-ac-expand.m4 b/as-ac-expand.m4
new file mode 100644
index 0000000000..d6c9e33060
--- /dev/null
+++ b/as-ac-expand.m4
@@ -0,0 +1,43 @@
+dnl as-ac-expand.m4 0.2.0
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl thomas@apestaart.org
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
diff --git a/autogen.sh b/autogen.sh
index c81b479ee9..7d3d713cc4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,6 +13,7 @@ PKG_NAME=NetworkManager
     exit 1
 }
 
+ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
 
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
diff --git a/configure.in b/configure.in
index 851b2e89da..2be87c8f09 100644
--- a/configure.in
+++ b/configure.in
@@ -278,36 +278,17 @@ fi
 AC_DEFINE_UNQUOTED(IP_BINARY_PATH, "$IP_BINARY_PATH", [Define to path of ip binary])
 AC_SUBST(IP_BINARY_PATH)
 
-#### find the actual value for $prefix that we'll end up with
-##   (I know this is broken and should be done in the Makefile, but
-##    that's a major pain and almost nobody actually seems to care)
-REAL_PREFIX=
-if test "x$prefix" = "xNONE"; then
-  REAL_PREFIX=$ac_default_prefix
-else
-  REAL_PREFIX=$prefix
-fi
-
-## temporarily change prefix and exec_prefix
-old_prefix=$prefix
-prefix=$REAL_PREFIX
+AS_AC_EXPAND(PREFIX, $prefix)
+AC_SUBST(PREFIX)
 
-if test "x$exec_prefix" = xNONE ; then
-   REAL_EXEC_PREFIX=$REAL_PREFIX
-else
-   REAL_EXEC_PREFIX=$exec_prefix
-fi
-old_exec_prefix=$exec_prefix
-exec_prefix=$REAL_EXEC_PREFIX
+AS_AC_EXPAND(BINDIR, $bindir)
+AC_SUBST(BINDIR)
 
-BINDIR_TMP="$bindir"
-EXPANDED_BINDIR=`eval echo $BINDIR_TMP`
-AC_SUBST(EXPANDED_BINDIR)
-AC_DEFINE_UNQUOTED(EXPANDED_BINDIR, "$EXPANDED_BINDIR", [Where the executables are installed])
+AS_AC_EXPAND(LIBDIR, $libdir)
+AC_SUBST(LIBDIR)
 
-## put prefix and exec_prefix back
-prefix=$old_prefix
-exec_prefix=$old_exec_prefix
+AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+AC_SUBST(LIBEXECDIR)
 
 AC_ARG_ENABLE(more-warnings,
 AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
diff --git a/dialup-services/Makefile b/dialup-services/Makefile
deleted file mode 100644
index a259c81dfc..0000000000
--- a/dialup-services/Makefile
+++ /dev/null
@@ -1,426 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# dialup-services/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/NetworkManager
-pkglibdir = $(libdir)/NetworkManager
-pkgincludedir = $(includedir)/NetworkManager
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = i686-redhat-linux-gnu
-ACLOCAL = ${SHELL} /home/tim/dev/NetworkManager/missing --run aclocal-1.7
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/tim/dev/NetworkManager/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/tim/dev/NetworkManager/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/tim/dev/NetworkManager/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/tim/dev/NetworkManager/missing --run automake-1.7
-AWK = gawk
-CATALOGS =  bg.gmo bs.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_CA.gmo es.gmo fi.gmo fr.gmo gu.gmo hr.gmo hu.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo nb.gmo ne.gmo nl.gmo pa.gmo pt_BR.gmo rw.gmo sk.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo uk.gmo vi.gmo wa.gmo zh_CN.gmo zh_TW.gmo
-CATOBJEXT = .gmo
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Werror -std=gnu89 -g -O2 -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wdeclaration-after-statement -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DATADIRNAME = share
-DBUS_CFLAGS = -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -DDBUS_VERSION_MAJOR=0 -DDBUS_VERSION_MINOR=61 -DDBUS_VERSION_MICRO=0
-DBUS_LIBS = -ldbus-glib-1 -ldbus-1 -lglib-2.0  
-DBUS_SYS_DIR = /etc/dbus-1/system.d
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DHCDBD_BINARY_PATH = /sbin/dhcdbd
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-EXPANDED_BINDIR = /usr/bin
-F77 = f95
-FFLAGS = -g -O2
-GCONF_CFLAGS = -DORBIT2=1 -pthread -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GCONF_LIBS = -pthread -lgconf-2 -lORBit-2 -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0  
-GDK_PIXBUF_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GDK_PIXBUF_LIBS = -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GETTEXT_PACKAGE = NetworkManager
-GLADE_CFLAGS = -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GLADE_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lz -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GLIB_GENMARSHAL = glib-genmarshal
-GLIB_LIBS = -lglib-2.0  
-GMODULE_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GMODULE_LIBS = -Wl,--export-dynamic -lgmodule-2.0 -ldl -lglib-2.0  
-GMOFILES =  bg.gmo bs.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_CA.gmo es.gmo fi.gmo fr.gmo gu.gmo hr.gmo hu.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo nb.gmo ne.gmo nl.gmo pa.gmo pt_BR.gmo rw.gmo sk.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo uk.gmo vi.gmo wa.gmo zh_CN.gmo zh_TW.gmo
-GMSGFMT = /usr/bin/msgfmt
-GNOME_KEYRING_CFLAGS = -I/usr/include/gnome-keyring-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GNOME_KEYRING_LIBS = -lgnome-keyring -lglib-2.0  
-GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GTHREAD_LIBS = -pthread -lgthread-2.0 -lglib-2.0  
-GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-HAL_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
-HAL_LIBS = -lhal -ldbus-1  
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLLIBS = 
-INTLTOOL_CAVES_RULE = %.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_DESKTOP_RULE = %.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_EXTRACT = $(top_builddir)/intltool-extract
-INTLTOOL_ICONV = /usr/bin/iconv
-INTLTOOL_KBD_RULE = %.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_KEYS_RULE = %.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_MERGE = $(top_builddir)/intltool-merge
-INTLTOOL_MSGFMT = /usr/bin/msgfmt
-INTLTOOL_MSGMERGE = /usr/bin/msgmerge
-INTLTOOL_OAF_RULE = %.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@
-INTLTOOL_PERL = /usr/bin/perl
-INTLTOOL_PONG_RULE = %.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_PROP_RULE = %.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SCHEMAS_RULE = %.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SERVER_RULE = %.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SERVICE_RULE = %.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SHEET_RULE = %.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SOUNDLIST_RULE = %.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_THEME_RULE = %.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_UI_RULE = %.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_UPDATE = $(top_builddir)/intltool-update
-INTLTOOL_XAM_RULE = %.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_XGETTEXT = /usr/bin/xgettext
-INTLTOOL_XML_NOMERGE_RULE = %.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
-INTLTOOL_XML_RULE = %.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-IP_BINARY_PATH = /sbin/ip
-IWLIB = -liw
-LDFLAGS = 
-LIBGCRYPT_CFLAGS =   
-LIBGCRYPT_CONFIG = /usr/bin/libgcrypt-config
-LIBGCRYPT_LIBS =  -lgcrypt -lgpg-error
-LIBGNOMEUI_CFLAGS = -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gnome-keyring-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2  
-LIBGNOMEUI_LIBS = -pthread -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-keyring -lxml2 -lz -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lpangoft2-1.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgnomevfs-2 -lbonobo-2 -lgconf-2 -lgobject-2.0 -lbonobo-activation -lORBit-2 -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0  
-LIBNL_CFLAGS =  
-LIBNL_LIBS = -lnl  
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = 
-MAINTAINER_MODE_FALSE = #
-MAINTAINER_MODE_TRUE = 
-MAKEINFO = ${SHELL} /home/tim/dev/NetworkManager/missing --run makeinfo
-MKINSTALLDIRS = ./mkinstalldirs
-MSGFMT = /usr/bin/msgfmt
-NOTIFY_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
-NOTIFY_LIBS = -lnotify -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -ldbus-glib-1 -ldbus-1 -lglib-2.0  
-OBJEXT = o
-PACKAGE = NetworkManager
-PACKAGE_BUGREPORT = dcbw@redhat.com
-PACKAGE_NAME = NetworkManager
-PACKAGE_STRING = NetworkManager 0.7.0
-PACKAGE_TARNAME = NetworkManager
-PACKAGE_VERSION = 0.7.0
-PANEL_APPLET_CFLAGS = -DORBIT2=1 -pthread -I/usr/include/panel-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gnome-keyring-1 -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/freetype2 -I/usr/include/libxml2  
-PANEL_APPLET_LIBS = -pthread -lpanel-applet-2 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-keyring -lxml2 -lz -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lpangoft2-1.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgnomevfs-2 -lbonobo-2 -lgconf-2 -lgobject-2.0 -lbonobo-activation -lORBit-2 -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0  
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-POFILES =  bg.po bs.po ca.po cs.po da.po de.po el.po en_CA.po es.po fi.po fr.po gu.po hr.po hu.po it.po ja.po ko.po lt.po lv.po mk.po nb.po ne.po nl.po pa.po pt_BR.po rw.po sk.po sq.po sr.po sr@Latn.po sv.po uk.po vi.po wa.po zh_CN.po zh_TW.po
-POSUB = po
-PO_IN_DATADIR_FALSE = 
-PO_IN_DATADIR_TRUE = 
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-TARGET_ARCH_FALSE = 
-TARGET_ARCH_TRUE = #
-TARGET_DEBIAN_FALSE = 
-TARGET_DEBIAN_TRUE = #
-TARGET_GENTOO_FALSE = 
-TARGET_GENTOO_TRUE = #
-TARGET_PALDO_FALSE = 
-TARGET_PALDO_TRUE = #
-TARGET_REDHAT_FALSE = #
-TARGET_REDHAT_TRUE = 
-TARGET_SLACKWARE_FALSE = 
-TARGET_SLACKWARE_TRUE = #
-TARGET_SUSE_FALSE = 
-TARGET_SUSE_TRUE = #
-USE_NLS = yes
-VERSION = 0.7.0
-WITH_GCRYPT_FALSE = #
-WITH_GCRYPT_TRUE = 
-WITH_GNOME_FALSE = #
-WITH_GNOME_TRUE = 
-WITH_NOTIFY_FALSE = #
-WITH_NOTIFY_TRUE = 
-WPA_SUPPLICANT_BINARY_PATH = /usr/sbin/wpa_supplicant
-XGETTEXT = /usr/bin/xgettext
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = f95
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-ac_pt_PKG_CONFIG = /usr/bin/pkg-config
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-bindir = ${exec_prefix}/bin
-build = i686-redhat-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = redhat
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-redhat-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = redhat
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/tim/dev/NetworkManager/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-oldincludedir = /usr/include
-prefix = /usr
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = /etc
-target_alias = 
-
-nmdialupservicedir = $(sysconfdir)/NetworkManager/dialup
-nmdialupservice_DATA = nm-btgprs-service.name	\
-			nm-modem-service.name	\
-			nm-pppoe-service.name
-
-
-CLEANFILES = *~
-EXTRA_DIST = $(nmdialupservice_DATA)
-subdir = dialup-services
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = nm-btgprs-service.name nm-modem-service.name \
-	nm-pppoe-service.name
-DIST_SOURCES =
-DATA = $(nmdialupservice_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am \
-	nm-btgprs-service.name.in nm-modem-service.name.in \
-	nm-pppoe-service.name.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  dialup-services/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-nm-btgprs-service.name: $(top_builddir)/config.status nm-btgprs-service.name.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-nm-modem-service.name: $(top_builddir)/config.status nm-modem-service.name.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-nm-pppoe-service.name: $(top_builddir)/config.status nm-pppoe-service.name.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-nmdialupserviceDATA_INSTALL = $(INSTALL_DATA)
-install-nmdialupserviceDATA: $(nmdialupservice_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(nmdialupservicedir)
-	@list='$(nmdialupservice_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(nmdialupserviceDATA_INSTALL) $$d$$p $(DESTDIR)$(nmdialupservicedir)/$$f"; \
-	  $(nmdialupserviceDATA_INSTALL) $$d$$p $(DESTDIR)$(nmdialupservicedir)/$$f; \
-	done
-
-uninstall-nmdialupserviceDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nmdialupservice_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(nmdialupservicedir)/$$f"; \
-	  rm -f $(DESTDIR)$(nmdialupservicedir)/$$f; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(nmdialupservicedir)
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nmdialupserviceDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-nmdialupserviceDATA
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-nmdialupserviceDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-nmdialupserviceDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dialup-services/Makefile.am b/dialup-services/Makefile.am
new file mode 100644
index 0000000000..b905af8762
--- /dev/null
+++ b/dialup-services/Makefile.am
@@ -0,0 +1,14 @@
+nmbtgprsservicedir = $(sysconfdir)/NetworkManager/dialup
+nmbtgprsservice_DATA = nm-btgprs-service.name
+
+nmmodemservicedir = $(sysconfdir)/NetworkManager/dialup
+nmmodemservice_DATA = nm-modem-service.name
+
+nmpppoeservicedir = $(sysconfdir)/NetworkManager/dialup
+nmpppoeservice_DATA = nm-pppoe-service.name
+
+EXTRA_DIST = $(nmbtgprsservice_DATA) \
+             $(nmmodemservice_DATA)  \
+             $(nmpppoeservice_DATA)
+
+CLEANFILES = *~
diff --git a/gnome/applet/Makefile.am b/gnome/applet/Makefile.am
index f476141a40..478902ec6a 100644
--- a/gnome/applet/Makefile.am
+++ b/gnome/applet/Makefile.am
@@ -17,7 +17,7 @@ nm_applet_CPPFLAGS =									\
 	$(LIBGNOMEUI_CFLAGS)								\
 	$(PANEL_APPLET_CFLAGS)								\
 	$(GNOME_KEYRING_CFLAGS)								\
-	-DICONDIR=\""$(datadir)/pixmaps"\"						\
+	-DICONDIR=\""$(datadir)/icons"\"						\
 	-DGLADEDIR=\""$(gladedir)"\"							\
 	-DBINDIR=\""$(bindir)"\"								\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"						\
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index 47fd77ecaf..e53c50d8f6 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -147,6 +147,9 @@ static void nma_class_init (NMAppletClass *klass)
 {
 	GObjectClass *gobject_class;
 
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+								ICONDIR);
+
 	gobject_class = G_OBJECT_CLASS (klass);
 	gobject_class->constructor = nma_constructor;
 }
@@ -580,7 +583,7 @@ void nma_show_dialup_failure_alert (NMApplet *applet, const char *member, const
 #else
 		msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n"
 			"%s\n\n%s", title, desc, error_msg);
-		nma_show_vpn_failure_dialog (title, msg);
+		nma_show_failure_dialog (title, msg);
 #endif
 		g_free (msg);
 	}
diff --git a/gnome/dialup-auth/ppp/Makefile.am b/gnome/dialup-auth/ppp/Makefile.am
index 98d436b303..fbdebb948d 100644
--- a/gnome/dialup-auth/ppp/Makefile.am
+++ b/gnome/dialup-auth/ppp/Makefile.am
@@ -7,7 +7,7 @@ nm_ppp_auth_dialog_CPPFLAGS =			\
 	$(GTK_CFLAGS)				\
 	$(LIBGNOMEUI_CFLAGS)			\
 	$(GNOMEKEYRING_CFLAGS)			\
-	-DICONDIR=\""$(datadir)/pixmaps"\"	\
+	-DICONDIR=\""$(datadir)/icons"\"	\
 	-DGLADEDIR=\""$(gladedir)"\"		\
 	-DBINDIR=\""$(bindir)"\"		\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
@@ -15,7 +15,7 @@ nm_ppp_auth_dialog_CPPFLAGS =			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
-	-DVERSION=\"$(VERSION)\"			\
+	-DVERSION=\"$(VERSION)\"		\
 	$(NULL)
 
 nm_ppp_auth_dialog_SOURCES =			\
diff --git a/gnome/dialup-auth/pppoe/Makefile.am b/gnome/dialup-auth/pppoe/Makefile.am
index 8bb3ef4bcc..ca8107b456 100644
--- a/gnome/dialup-auth/pppoe/Makefile.am
+++ b/gnome/dialup-auth/pppoe/Makefile.am
@@ -11,7 +11,7 @@ nm_pppoe_auth_dialog_CPPFLAGS =			\
 	$(GLADE_CFLAGS)				\
 	$(LIBGNOMEUI_CFLAGS)			\
 	$(GNOMEKEYRING_CFLAGS)			\
-	-DICONDIR=\""$(datadir)/pixmaps"\"	\
+	-DICONDIR=\""$(datadir)/icons"\"	\
 	-DGLADEDIR=\""$(gladedir)"\"		\
 	-DBINDIR=\""$(bindir)"\"		\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
@@ -19,7 +19,7 @@ nm_pppoe_auth_dialog_CPPFLAGS =			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
-	-DVERSION=\"$(VERSION)\"			\
+	-DVERSION=\"$(VERSION)\"		\
 	$(NULL)
 
 nm_pppoe_auth_dialog_SOURCES =			\
diff --git a/gnome/dialup-properties/Makefile.am b/gnome/dialup-properties/Makefile.am
index 4fc56247bd..d4cdc6962e 100644
--- a/gnome/dialup-properties/Makefile.am
+++ b/gnome/dialup-properties/Makefile.am
@@ -26,7 +26,7 @@ nm_dialup_properties_CFLAGS =                              \
         $(LIBGNOMEUI_CFLAGS)                            \
 	$(DBUS_CFLAGS)					\
         -DSYSCONFDIR=\"$(sysconfdir)\"			\
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DICONDIR=\""$(datadir)/icons"\"              \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
diff --git a/gnome/dialup-properties/btgprs/Makefile.am b/gnome/dialup-properties/btgprs/Makefile.am
index d49baeb9ab..d2fb6a4944 100644
--- a/gnome/dialup-properties/btgprs/Makefile.am
+++ b/gnome/dialup-properties/btgprs/Makefile.am
@@ -8,13 +8,13 @@ libnm_btgprs_properties_la_SOURCES = 			\
 gladedir = $(datadir)/gnome-dialup-properties
 glade_DATA = nm-btgprs-dialog.glade
 
-libnm_btgprs_properties_la_CFLAGS =                          \
+libnm_btgprs_properties_la_CFLAGS =                     \
         $(GLADE_CFLAGS)                                 \
         $(GTK_CFLAGS)                                   \
         $(GCONF_CFLAGS)                                 \
         $(LIBGNOMEUI_CFLAGS)                            \
 	$(DBUS_CFLAGS)					\
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DICONDIR=\""$(datadir)/icons"\"                \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
@@ -23,7 +23,7 @@ libnm_btgprs_properties_la_CFLAGS =                          \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
-libnm_btgprs_properties_la_LIBADD =       \
+libnm_btgprs_properties_la_LIBADD =     \
         $(GLADE_LIBS)                   \
         $(GTK_LIBS)                     \
         $(GCONF_LIBS)                   \
diff --git a/gnome/dialup-properties/modem/Makefile.am b/gnome/dialup-properties/modem/Makefile.am
index 9765abd39e..ccf2fcc0fb 100644
--- a/gnome/dialup-properties/modem/Makefile.am
+++ b/gnome/dialup-properties/modem/Makefile.am
@@ -8,13 +8,13 @@ libnm_modem_properties_la_SOURCES = 			\
 gladedir = $(datadir)/gnome-dialup-properties
 glade_DATA = nm-modem-dialog.glade
 
-libnm_modem_properties_la_CFLAGS =                          \
+libnm_modem_properties_la_CFLAGS =                      \
         $(GLADE_CFLAGS)                                 \
         $(GTK_CFLAGS)                                   \
         $(GCONF_CFLAGS)                                 \
         $(LIBGNOMEUI_CFLAGS)                            \
 	$(DBUS_CFLAGS)					\
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DICONDIR=\""$(datadir)/icons"\"                \
         -DGLADEDIR=\""$(gladedir)"\"                    \
 	-DDBUS_API_SUBJECT_TO_CHANGE			\
         -DG_DISABLE_DEPRECATED                          \
diff --git a/gnome/dialup-properties/pppoe/Makefile.am b/gnome/dialup-properties/pppoe/Makefile.am
index 0a4ccba830..860d30f94f 100644
--- a/gnome/dialup-properties/pppoe/Makefile.am
+++ b/gnome/dialup-properties/pppoe/Makefile.am
@@ -8,13 +8,13 @@ libnm_pppoe_properties_la_SOURCES = 			\
 gladedir = $(datadir)/gnome-dialup-properties
 glade_DATA = nm-pppoe-dialog.glade
 
-libnm_pppoe_properties_la_CFLAGS =                          \
+libnm_pppoe_properties_la_CFLAGS =                      \
         $(GLADE_CFLAGS)                                 \
         $(GTK_CFLAGS)                                   \
         $(GCONF_CFLAGS)                                 \
         $(LIBGNOMEUI_CFLAGS)                            \
 	$(DBUS_CFLAGS)					\
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DICONDIR=\""$(datadir)/icons"\"                \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
@@ -23,7 +23,7 @@ libnm_pppoe_properties_la_CFLAGS =                          \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
-libnm_pppoe_properties_la_LIBADD =       \
+libnm_pppoe_properties_la_LIBADD =      \
         $(GLADE_LIBS)                   \
         $(GTK_LIBS)                     \
         $(GCONF_LIBS)                   \
diff --git a/gnome/vpn-properties/Makefile.am b/gnome/vpn-properties/Makefile.am
index 550a6cc96d..da8426f673 100644
--- a/gnome/vpn-properties/Makefile.am
+++ b/gnome/vpn-properties/Makefile.am
@@ -22,7 +22,7 @@ nm_vpn_properties_CFLAGS =                              \
         $(GMODULE_CFLAGS)                               \
         $(LIBGNOMEUI_CFLAGS)                            \
         -DSYSCONFDIR=\"$(sysconfdir)\"			\
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DICONDIR=\""$(datadir)/icons"\"                \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c
index 5aa43dd930..93c805506a 100644
--- a/src/backends/NetworkManagerArch.c
+++ b/src/backends/NetworkManagerArch.c
@@ -48,7 +48,6 @@
 #include "nm-device.h"
 #include "nm-device-802-3-ethernet.h"
 #include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
 #include "interface_parser.h"
 #include "nm-utils.h"
 
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
index 3e6ea0d283..179b5ae78f 100644
--- a/src/backends/NetworkManagerDebian.c
+++ b/src/backends/NetworkManagerDebian.c
@@ -37,7 +37,6 @@
 #include "nm-device.h"
 #include "nm-device-802-3-ethernet.h"
 #include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
 #include "interface_parser.h"
 #include "nm-utils.h"
 
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
index 1c80912f2f..647cae0a8b 100644
--- a/src/backends/NetworkManagerRedHat.c
+++ b/src/backends/NetworkManagerRedHat.c
@@ -33,7 +33,6 @@
 #include "nm-device.h"
 #include "nm-device-802-3-ethernet.h"
 #include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
 #include "nm-utils.h"
 #include "shvar.h"
 
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index 9aac6860a2..63b9714918 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -51,7 +51,6 @@
 #include "cipher-wpa-psk-passphrase.h"
 #include "nm-device-802-3-ethernet.h"
 #include "nm-device-802-11-wireless.h"
-#include "NetworkManagerDialupConfig.h"
 #include "nm-utils.h"
 #include "shvar.h"
 
diff --git a/src/dialup/ppp/nm-ppp-service.c b/src/dialup/ppp/nm-ppp-service.c
index 2c21aaf840..9dcb1ee11b 100644
--- a/src/dialup/ppp/nm-ppp-service.c
+++ b/src/dialup/ppp/nm-ppp-service.c
@@ -44,7 +44,7 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
 
 #include "nm-ppp-service.h"
 #include "nm-utils.h"
diff --git a/src/dialup/ppp/nm-pppd-plugin.c b/src/dialup/ppp/nm-pppd-plugin.c
index ab0523e328..cb7e40d780 100644
--- a/src/dialup/ppp/nm-pppd-plugin.c
+++ b/src/dialup/ppp/nm-pppd-plugin.c
@@ -36,7 +36,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
 
 #include "nm-ppp-service.h"
 #include "nm-pppd-plugin.h"