--- vu-meter/Makefile.in.orig	Wed Mar  3 12:35:57 1999
+++ vu-meter/Makefile.in	Wed Mar  3 12:36:25 1999
@@ -116,9 +116,9 @@
 ZVT_LIBS = @ZVT_LIBS@
 l = @l@
 
-Audiodir = $(datadir)/gnome/apps/Multimedia
+Audiodir = $(datadir)/apps/Multimedia
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = vumeter
--- gmix/Makefile.in.orig	Wed Sep 22 03:11:25 1999
+++ gmix/Makefile.in	Fri Sep 24 11:55:02 1999
@@ -123,12 +123,12 @@
 cxxflags_set = @cxxflags_set@
 l = @l@
 
-Audiodir = $(datadir)/gnome/apps/Multimedia
+Audiodir = $(datadir)/apps/Multimedia
 pixmapdir = $(datadir)/pixmaps
 
 EXTRA_DIST = README TODO NEWS gmix.desktop gnome-mixer.png
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gmix
--- tcd/Makefile.in.orig	Tue Oct  5 12:29:27 1999
+++ tcd/Makefile.in	Sun Jan 30 23:10:53 2000
@@ -123,7 +123,7 @@
 cxxflags_set = @cxxflags_set@
 l = @l@
 
-Audiodir = $(datadir)/gnome/apps/Multimedia
+Audiodir = $(datadir)/apps/Multimedia
 
 EXTRA_DIST = README TODO NEWS gtcd.desktop
 
@@ -144,11 +144,11 @@
 gtcd_LDADD = $(GNOME_LIBDIR) 		$(GNOMEUI_LIBS) 		$(INTLLIBS)
 
 
-tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS)
+tcd_LDADD = `${GLIB_CONFIG} --libs` -lm $(CURSES_LIBS) $(INTLLIBS)
 
 CLEANFILES = *~
 
-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -g
+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -g
 
 
 Audio_DATA = gtcd.desktop
--- cddbslave/Makefile.in.orig	Thu Jul 15 07:55:51 1999
+++ cddbslave/Makefile.in	Fri Jul 16 00:02:50 1999
@@ -123,7 +123,7 @@
 cxxflags_set = @cxxflags_set@
 l = @l@
 
-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
 
 
 bin_PROGRAMS = cddbslave cddbsubmit
@@ -137,7 +137,7 @@
 cddbsubmit_LDADD = $(GNOME_LIBDIR) 			$(GNOME_LIBS) 			$(GHTTP_LIB) 			$(INTLLIBS)
 
 
-gnomedatadir = $(datadir)/gnome
+gnomedatadir = $(datadir)
 
 gnomedata_DATA = cddb-submit-methods