--- gncal/Makefile.in.orig	Sat May 20 20:52:50 2000
+++ gncal/Makefile.in	Tue May 30 14:34:37 2000
@@ -143,3 +143,3 @@
 
-help_base = $(datadir)/gnome/help/cal
+help_base = $(datadir)/help/gnomecal
 
@@ -148,3 +148,3 @@
 
-INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
 
@@ -223,3 +223,3 @@
 
-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
 @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
@@ -235,3 +235,3 @@
 
-Productivitydir = $(datadir)/gnome/apps/Applications
+Productivitydir = $(datadir)/apps/Applications
 
--- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
+++ gnomecard/Makefile.in	Tue May 30 14:35:44 2000
@@ -137,5 +137,5 @@
 
-xpmhelp_base = $(datadir)/gnome/help/cal
+xpmhelp_base = $(datadir)/help/cal
 
-INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
+INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
 
@@ -185,3 +185,3 @@
 
-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
 @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
@@ -194,3 +194,3 @@
 
-Productivitydir = $(datadir)/gnome/apps/Applications
+Productivitydir = $(datadir)/apps/Applications