--- Makefile.in.orig	Fri Oct  2 20:59:11 1998
+++ Makefile.in	Fri Oct  2 20:59:24 1998
@@ -152,7 +152,7 @@
 
 SUBDIRS = po intl macros \
 	gcalc ghex gsearchtool $(gdiskfree) gtt \
-	$(guile_DIRS) $(objc_DIRS) mini-utils gncal splash gdialog
+	$(guile_DIRS) $(objc_DIRS) mini-utils gncal splash #gdialog
 
 EXTRA_DIST = gnome-utils.spec
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -170,7 +170,7 @@
 TAR = tar
 GZIP = --best
 DIST_SUBDIRS =  po intl macros gcalc ghex gsearchtool gdiskfree gtt \
-mini-utils gncal splash gdialog
+mini-utils gncal splash #gdialog
 all: all-recursive-am all-am
 
 .SUFFIXES:
--- gcalc/Makefile.in.orig	Fri Oct  2 21:00:25 1998
+++ gcalc/Makefile.in	Fri Oct  2 21:00:47 1998
@@ -147,8 +147,8 @@
 Utilitiesdir = $(datadir)/apps/Utilities
 
 INCLUDES = 						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DLOCALEDIR=\"$(datadir)/locale\"		\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
+	-DLOCALEDIR=\"$(prefix)/share/locale\"		\
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)
 
--- gdiskfree/Makefile.in.orig	Fri Oct  2 21:00:56 1998
+++ gdiskfree/Makefile.in	Fri Oct  2 21:01:13 1998
@@ -145,7 +145,7 @@
 l = @l@
 
 INCLUDES =						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"	\
 	-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
 
 bin_PROGRAMS = gdiskfree
--- ghex/Makefile.in.orig	Fri Oct  2 21:01:23 1998
+++ ghex/Makefile.in	Fri Oct  2 21:05:07 1998
@@ -145,8 +145,8 @@
 l = @l@
 
 INCLUDES = -I$(includedir) 				\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DLOCALEDIR=\"$(datadir)/locale\"		\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
+	-DLOCALEDIR=\"$(prefix)/share/locale\"		\
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = ghex
@@ -158,7 +158,7 @@
 
 EXTRA_DIST = index.html ghex.desktop ghex-topic.dat
 
-ghex_helpdir = $(datadir)/gnome/help/ghex/C
+ghex_helpdir = $(datadir)/help/ghex/C
 
 sysdir   = $(datadir)/apps/Applications
 sys_DATA = ghex.desktop
--- gncal/Makefile.in.orig	Fri Oct  2 21:02:39 1998
+++ gncal/Makefile.in	Fri Oct  2 21:05:33 1998
@@ -145,12 +145,12 @@
 l = @l@
 
 SUBDIRS = versit gnomecard
-help_base = $(datadir)/gnome/help/cal
+help_base = $(datadir)/help/cal
 
 INCLUDES = 			\
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)				\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
 	-I../../gcalendar
 
 bin_PROGRAMS = gnomecal
--- gncal/gnomecard/Makefile.in.orig	Fri Oct  2 21:03:24 1998
+++ gncal/gnomecard/Makefile.in	Fri Oct  2 21:05:44 1998
@@ -144,12 +144,12 @@
 YACC = @YACC@
 l = @l@
 
-xpmhelp_base = $(datadir)/gnome/help/cal
+xpmhelp_base = $(datadir)/help/cal
 
 INCLUDES = 			\
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)				\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
 	-I../../gcalendar
 
 bin_PROGRAMS = gnomecard
--- gsearchtool/Makefile.in.orig	Fri Oct  2 21:03:50 1998
+++ gsearchtool/Makefile.in	Fri Oct  2 21:04:08 1998
@@ -147,8 +147,8 @@
 Utilitiesdir = $(datadir)/apps/Utilities
 
 INCLUDES = 						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DLOCALEDIR=\"$(datadir)/locale\"		\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
+	-DLOCALEDIR=\"$(prefix)/share/locale\"		\
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)
 
--- gtt/Makefile.in.orig	Fri Oct  2 21:04:17 1998
+++ gtt/Makefile.in	Fri Oct  2 21:06:08 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = gtt
@@ -191,7 +191,7 @@
 
 # maybe there is a macro for that?
 
-gtt_helpdir = $(datadir)/gnome/help/gtt/C
+gtt_helpdir = $(datadir)/help/gtt/C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
--- mini-utils/gcolorsel/Makefile.in.orig	Fri Oct  2 21:11:22 1998
+++ mini-utils/gcolorsel/Makefile.in	Fri Oct  2 21:11:40 1998
@@ -147,8 +147,8 @@
 Utilitiesdir = $(datadir)/apps/Utilities
 
 INCLUDES = 						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DLOCALEDIR=\"$(datadir)/locale\"		\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
+	-DLOCALEDIR=\"$(prefix)/share/locale\"		\
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)
 
--- mini-utils/gfontsel/Makefile.in.orig	Fri Oct  2 21:10:57 1998
+++ mini-utils/gfontsel/Makefile.in	Fri Oct  2 21:11:14 1998
@@ -147,8 +147,8 @@
 Utilitiesdir = $(datadir)/apps/Utilities
 
 INCLUDES = 						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DLOCALEDIR=\"$(datadir)/locale\"		\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
+	-DLOCALEDIR=\"$(prefix)/share/locale\"		\
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)
 
--- mini-utils/gless/Makefile.in.orig	Fri Oct  2 21:10:20 1998
+++ mini-utils/gless/Makefile.in	Fri Oct  2 21:10:31 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = gless
--- mini-utils/gnome-run/Makefile.in.orig	Fri Oct  2 21:10:08 1998
+++ mini-utils/gnome-run/Makefile.in	Fri Oct  2 21:09:49 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = gnome-run
--- mini-utils/gshutdown/Makefile.in.orig	Fri Oct  2 21:08:07 1998
+++ mini-utils/gshutdown/Makefile.in	Fri Oct  2 21:08:30 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = gshutdown
@@ -165,7 +165,7 @@
 	gshutdown.html		\
 	gshutdown.desktop
 
-gshutdown_helpdir = $(datadir)/gnome/help/gshutdown/C
+gshutdown_helpdir = $(datadir)/help/gshutdown/C
 
 Systemdir = $(datadir)/apps/System
 System_DATA = gshutdown.desktop
--- mini-utils/guname/Makefile.in.orig	Fri Oct  2 21:08:40 1998
+++ mini-utils/guname/Makefile.in	Fri Oct  2 21:09:02 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR) $(LIBGTOP_NAMES_INCS)
 
 bin_PROGRAMS = guname
--- mini-utils/gw/Makefile.in.orig	Fri Oct  2 21:09:10 1998
+++ mini-utils/gw/Makefile.in	Fri Oct  2 21:09:27 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = gw
--- mini-utils/idetool/Makefile.in.orig	Fri Oct  2 21:10:39 1998
+++ mini-utils/idetool/Makefile.in	Fri Oct  2 21:10:51 1998
@@ -146,7 +146,7 @@
 
 INCLUDES = 			\
 	-I$(includedir)		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = idetool
--- splash/Makefile.in.orig	Fri Oct  2 21:11:49 1998
+++ splash/Makefile.in	Fri Oct  2 21:12:07 1998
@@ -145,8 +145,8 @@
 l = @l@
 
 INCLUDES = -I$(includedir) 				\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DLOCALEDIR=\"$(datadir)/locale\"		\
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	\
+	-DLOCALEDIR=\"$(prefix)/share/locale\"		\
 	$(GNOME_INCLUDEDIR)
 
 bin_PROGRAMS = splash splac
