# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 954534132 0
# Node ID 66c5a24b62ec084c7b8a88993f126632c7b329b4
# Parent  b06013f863fb85a1c4d457166aa9ed88c4d4df7f
[gaim-migrate @ 88]
Touch-ups with the install for applet. Rather than all that extra stuff at
the end of ./configure, all you need now is --enable-gnome. ./configure will
figure out where gnome-config is and use that to determine where things should
be installed.

committer: Tailor Script <tailor@pidgin.im>

diff -r b06013f863fb -r 66c5a24b62ec Makefile.am
--- a/Makefile.am	Fri Mar 31 20:21:08 2000 +0000
+++ b/Makefile.am	Fri Mar 31 20:22:12 2000 +0000
@@ -4,16 +4,19 @@
 
 if GNOMEAPPLET
 
+gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`
+gnomedata    = `@GNOME_CONFIG@ --datadir`
+
 gaim_GNORBA = gaim_applet.gnorba
-gaimgnorbadir  = $(sysconfdir)/CORBA/servers
+gaimgnorbadir  = $(gnomesysconf)/CORBA/servers
 gaimgnorba_DATA = $(gaim_GNORBA)
 
 gaim_DESKTOP = gaim_applet.desktop
-gaimdesktopdir = $(datadir)/applets/Network
+gaimdesktopdir = $(gnomedata)/applets/Network
 gaimdesktop_DATA = $(gaim_DESKTOP)
 
 gaim_SOUND = gaim_applet.soundlist
-gaimsounddir = $(sysconfdir)/sound/events
+gaimsounddir = $(gnomesysconf)/sound/events
 gaimsound_DATA = $(gaim_SOUND)
 
 endif
diff -r b06013f863fb -r 66c5a24b62ec README
--- a/README	Fri Mar 31 20:21:08 2000 +0000
+++ b/README	Fri Mar 31 20:22:12 2000 +0000
@@ -33,9 +33,7 @@
 whatever.
 
 The panel (if you made an applet) requires certain things to be in certain
-places, I recommend running:
-./configure --enable-gnome --sysconfdir=`gnome-config --sysconfdir` \
---datadir=`gnome-config --datadir`
+places, but the Makefile/configure script should figure things out for you.
 
 Send me bug reports.  The web page is http://www.marko.net/gaim and the ftp
 site is ftp://ftp.marko.net/pub/gaim
diff -r b06013f863fb -r 66c5a24b62ec sounds/Makefile.am
--- a/sounds/Makefile.am	Fri Mar 31 20:21:08 2000 +0000
+++ b/sounds/Makefile.am	Fri Mar 31 20:22:12 2000 +0000
@@ -19,6 +19,7 @@
 	./au2h Receive.au Receive.h                  
 
 if GNOMEAPPLET
-gaimsoundsdir = $(datadir)/sounds/gaim
+gnomedata = `@GNOME_CONFIG@ --datadir`
+gaimsoundsdir = $(gnomedata)/sounds/gaim
 gaimsounds_DATA = $(EXTRA_DIST)
 endif