--- pixmaps/Makefile.in.orig	Fri Mar 15 15:50:57 2002
+++ pixmaps/Makefile.in	Fri Mar 15 15:50:26 2002
@@ -150,23 +150,15 @@
 SUBDIRS = protocols
 EXTRA_DIST = ab.xpm						about_small.xpm					add.xpm						add_small.xpm					admin_icon.xpm					aimicon.xpm					angel.xpm					aol_icon.xpm					available-away.xpm				available-chat.xpm				available-dnd.xpm				available-xa.xpm				available.xpm					away.png					away_big.xpm					away_icon.xpm					away_small.xpm					bgcolor.xpm					big.xpm						bigsmile.xpm					block.xpm					bold.xpm					broken.xpm					burp.xpm					cancel.xpm					close.xpm					close_small.xpm					connect.png					crazy4.xpm					crossedlips.xpm					cry.xpm						dt_icon.xpm					download.xpm					embarrassed.xpm					exit_small.xpm					farted.xpm					fgcolor.xpm					fontface.xpm					fontface2.xpm					free_icon.xpm					gaim.xpm					gg_suncloud.xpm					gg_sunred.xpm					gg_sunwhitered.xpm				gg_sunyellow.xpm				gnome_add.xpm					gnome_preferences.xpm				gnome_remove.xpm 				gnomeicu-away.xpm				gnomeicu-dnd.xpm				gnomeicu-ffc.xpm				gnomeicu-na.xpm					gnomeicu-occ.xpm				gnomeicu-offline.xpm				gnomeicu-online.xpm				group.xpm					image_icon.xpm				import_small.xpm				irc_icon.xpm					italic.xpm					join.xpm					kiss.xpm					link.xpm					login_icon.xpm					logo.xpm					logout_icon.xpm					logout_menu.xpm					luke03.xpm					moneymouth.xpm					mrt.xpm						msgpend.png					msn_away.xpm					msn_online.xpm					napster.xpm					no_icon.xpm					normal.xpm					offline.png					ok.xpm						oneeye.xpm					online.png					panic.xpm					plugins_small.xpm				pounce_small.xpm				prefs_small.xpm					refresh.xpm					sad.xpm						save.xpm					save_small.xpm					scream.xpm					search_small.xpm				send_small.xpm					small.xpm					smile.xpm					smile8.xpm					smile_icon.xpm					speaker.xpm					status-away.xpm					status-game.xpm					status-here.xpm					status-idle.xpm					strike.xpm					tb_forward.xpm					tb_redo.xpm					tb_refresh.xpm					tb_search.xpm					tb_undo.xpm					think.xpm					tmp_send.xpm					tongue.xpm					underline.xpm					warn.xpm					wink.xpm					wood.xpm					yell.xpm			
 
+@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
+@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
+@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
+@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
 
-@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim
-@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = gaim.xpm
 
-@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
-@DISTRIB_TRUE@distpixmap_DATA = gaim.xpm
-
-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
-
-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
-
-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
-
-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =