# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 953939008 0
# Node ID 61e94e1bd4c8ec67e1829f346994785e6b521a22
# Parent  40b5e0ba1214571635bfc4e666a0d06a36f39bf4
[gaim-migrate @ 40]
More installation differences between app/applet

committer: Tailor Script <tailor@pidgin.im>

diff -r 40b5e0ba1214 -r 61e94e1bd4c8 configure.in
--- a/configure.in	Fri Mar 24 22:47:06 2000 +0000
+++ b/configure.in	Fri Mar 24 23:03:28 2000 +0000
@@ -31,7 +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)
+AM_CONDITIONAL(GNOMEAPPLET, 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 40b5e0ba1214 -r 61e94e1bd4c8 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Fri Mar 24 22:47:06 2000 +0000
+++ b/pixmaps/Makefile.am	Fri Mar 24 23:03:28 2000 +0000
@@ -10,14 +10,12 @@
         online.xpm signing_on.xpm msg_pending.xpm \
         away.xpm away_icon.xpm underline.xpm \
         peng_smile.xpm peng_frown.xpm peng_wink.xpm \
-	strike.xpm \
-	gnome/devil-connect.png gnome/devil-offline.png \
-	gnome/devil-online.png gnome/penguin-connect.png \
-	gnome/penguin-offline.png gnome/penguin-online.png
+	strike.xpm \ devil-connect.png devil-offline.png \
+	devil-online.png penguin-connect.png \
+	penguin-offline.png penguin-online.png
 	
-if APPLET
-gaim_PIXMAP = aimicon.xpm gnome/penguin-connect.png \
-	gnome/penguin-offline.png gnome/penguin-online.png
+if GNOMEAPPLET
 gaimpixmapdir = $(datadir)/pixmaps/gaim
-gaimpixmap_DATA = $(gaim_PIXMAP)
+gaimpixmap_DATA = aimicon.xpm penguin-connect.png \
+	penguin-offline.png penguin-online.png
 endif
diff -r 40b5e0ba1214 -r 61e94e1bd4c8 src/Makefile.am
--- a/src/Makefile.am	Fri Mar 24 22:47:06 2000 +0000
+++ b/src/Makefile.am	Fri Mar 24 23:03:28 2000 +0000
@@ -1,9 +1,17 @@
-bin_PROGRAMS = gaim
-
-gaim_SOURCES = about.c aim.c away.c buddy.c buddy_chat.c conversation.c \
+if GNOMEAPPLET
+bin_PROGRAMS = gaim_applet
+gaim_applet_SOURCES = about.c aim.c away.c buddy.c buddy_chat.c conversation.c \
 	dialogs.c html.c prefs.c proxy.c toc.c sound.c gaim.h \
 	gnome_applet_mgr.c plugins.c network.c server.c \
         browser.c util.c oscar.c gtkhtml.c idle.c gaimrc.c
+else
+bin_PROGRAMS = gaim
+gaim_SOURCES = about.c aim.c away.c buddy.c buddy_chat.c conversation.c \
+	dialogs.c html.c prefs.c proxy.c toc.c sound.c gaim.h \
+	plugins.c network.c server.c browser.c util.c oscar.c gtkhtml.c \
+	idle.c gaimrc.c
+endif
+
 
 
 CFLAGS += $(GAIM_CFLAGS)
diff -r 40b5e0ba1214 -r 61e94e1bd4c8 src/gnome_applet_mgr.h
--- a/src/gnome_applet_mgr.h	Fri Mar 24 22:47:06 2000 +0000
+++ b/src/gnome_applet_mgr.h	Fri Mar 24 23:03:28 2000 +0000
@@ -54,7 +54,7 @@
 #define _MSG_ONLINE_ "Online"
 #define _MSG_FONT_ "-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-1"
 
-#define GAIM_GNOME_PIXMAP_DIR "/usr/share/pixmaps/gaim/gnome/"
+#define GAIM_GNOME_PIXMAP_DIR "/usr/share/pixmaps/gaim/"
 
 /*this should be configurable instead of hard coded.*/
 #if 0