# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 953933210 0
# Node ID 53ec244b6574b0730cee80d72a2e958f2163e2bf
# Parent  09a58e668f7b1b4bb2df732946eb31bc2aeff835
[gaim-migrate @ 38]
Installation of applet works a lot better now (imho)

committer: Tailor Script <tailor@pidgin.im>

diff -r 09a58e668f7b -r 53ec244b6574 Makefile.am
--- a/Makefile.am	Fri Mar 24 20:56:56 2000 +0000
+++ b/Makefile.am	Fri Mar 24 21:26:50 2000 +0000
@@ -6,7 +6,7 @@
 gaimgnorba_DATA = $(gaim_GNORBA)
 
 gaim_DESKTOP = gaim_applet.desktop
-gaimdesktopdir = $(datadir)/applets/Amusements
+gaimdesktopdir = $(datadir)/applets/Network
 gaimdesktop_DATA = $(gaim_DESKTOP)
 
 
diff -r 09a58e668f7b -r 53ec244b6574 configure.in
--- a/configure.in	Fri Mar 24 20:56:56 2000 +0000
+++ b/configure.in	Fri Mar 24 21:26:50 2000 +0000
@@ -31,6 +31,7 @@
 
 AC_ARG_ENABLE(debug, [  --enable-debug          compile with debugging support],enable_debug=yes,)
 AC_ARG_ENABLE(gnome, [  --enable-gnome          compile as a GNOME applet],enable_gnome=yes,)
+AM_CONDITIONAL(APPLET, test x$enable_gnome = xyes)
 AC_ARG_ENABLE(esd,   [  --disable-esd           Turn off ESD (default=auto)],enable_esd=no,enable_esd=yes)
 AC_ARG_ENABLE(oscar, [  --enable-oscar          Enable Oscar support (experimental)],enable_oscar=yes,)
 AC_ARG_ENABLE(nas,   [  --enable-nas            Enable NAS (Network Audio System) support],enable_nas=yes,)
diff -r 09a58e668f7b -r 53ec244b6574 gaim_applet.desktop
--- a/gaim_applet.desktop	Fri Mar 24 20:56:56 2000 +0000
+++ b/gaim_applet.desktop	Fri Mar 24 21:26:50 2000 +0000
@@ -2,6 +2,6 @@
 Name=Gaim
 Comment=Client for AOL IM
 Exec=gaim_applet --activate-goad-server=gaim_applet
-Icon=gaim.xpm
+Icon=gaim/aimicon.xpm
 Terminal=0
 Type=Application
diff -r 09a58e668f7b -r 53ec244b6574 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Fri Mar 24 20:56:56 2000 +0000
+++ b/pixmaps/Makefile.am	Fri Mar 24 21:26:50 2000 +0000
@@ -15,3 +15,9 @@
 	gnome/devil-online.png gnome/penguin-connect.png \
 	gnome/penguin-offline.png gnome/penguin-online.png
 	
+if APPLET
+gaim_PIXMAP = aimicon.xpm gnome/penguin-connect.png \
+	gnome/penguin-offline.png gnome/penguin-online.png
+gaimpixmapdir = $(datadir)/pixmaps/gaim
+gaimpixmap_DATA = $(gaim_PIXMAP)
+endif