[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.73,1.74

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv8207/pixmaps

Modified Files:
	Makefile.am 
Log Message:
HEAD is now GTK 2 only.  If you want to use GTK1.2, use our gtk1_stable branch.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- Makefile.am	5 Aug 2002 07:56:37 -0000	1.73
+++ Makefile.am	25 Aug 2002 04:59:34 -0000	1.74
@@ -127,31 +127,10 @@
 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
 gaimbuttonpix_DATA = edit.png
 
-if DISTRIB
-
-	gaimdistpixdir = $(datadir)/pixmaps/gaim
-	gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
-
-	distpixmapdir = $(datadir)/pixmaps
-	distpixmap_DATA = gaim.png
-
-else
-
-if GNOMEAPPLET
-
-gnomedata    = `@GNOME_CONFIG@ --datadir`
-
-gaimdistpmdir = $(gnomedata)/pixmaps/gaim
-gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
-
-gaimpixmapdir = $(gnomedata)/pixmaps
-gaimpixmap_DATA = gaim.png
-
-else
+gaimdistpixdir = $(datadir)/pixmaps/gaim
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
 
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = gaim.png
+distpixmapdir = $(datadir)/pixmaps
+distpixmap_DATA = gaim.png
 
-endif
 
-endif