--- Makefile.am.orig	Tue Dec 21 21:11:05 1999
+++ Makefile.am	Tue Dec 21 21:12:45 1999
@@ -5,17 +5,18 @@
 pkgdata_DATA = dia_logo.png
 man_MANS = dia.1
 
-pixmapdir = $(datadir)/pixmaps
+gnomedatadir = $(datadir)/gnome
+pixmapdir = $(gnomedatadir)/pixmaps
 pixmap_DATA = dia_gnome_icon.png dia-diagram.png
 
-Applicationsdir = $(datadir)/gnome/apps/Applications
+Applicationsdir = $(gnomedatadir)/apps/Applications
 Applications_DATA = dia.desktop
 
 dia.keys: $(srcdir)/dia.keys.in Makefile
 	sed -e 's^\@icondir\@^$(pixmapdir)^g' $(srcdir)/dia.keys.in > dia.keys.tmp \
 	&& mv dia.keys.tmp dia.keys
 
-mimedir = $(datadir)/mime-info
+mimedir = $(gnomedatadir)/mime-info
 mime_DATA = dia.mime dia.keys
 
 EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png \