--- Makefile.in.orig	Mon Aug  7 12:15:36 2000
+++ Makefile.in	Mon Aug  7 12:15:39 2000
@@ -120,14 +120,16 @@
 pkgdata_DATA = dia_logo.png
 man_MANS = dia.1
 
+ifdef HAVE_GNOME
 pixmapdir = $(gnomedatadir)/pixmaps
 pixmap_DATA = dia_gnome_icon.png dia-diagram.png
 
-Applicationsdir = $(gnomedatadir)/gnome/apps/Applications
+Applicationsdir = $(gnomedatadir)/apps/Applications
 Applications_DATA = dia.desktop
 
 mimedir = $(gnomedatadir)/mime-info
 mime_DATA = dia.mime dia.keys
+endif
 
 EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png 	dia.desktop dia.spec KNOWN_BUGS $(pkgdata_DATA) $(man_MANS) 	dia-diagram.png dia.mime dia.keys.in 	doc/diagram.dtd doc/sheet.dtd doc/custom-shapes
 
@@ -237,7 +239,6 @@
 
 install-ApplicationsDATA: $(Applications_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
 	@list='$(Applications_DATA)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \
@@ -256,7 +257,6 @@
 
 install-mimeDATA: $(mime_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(mimedir)
 	@list='$(mime_DATA)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(mimedir)/$$p"; \
@@ -275,7 +275,6 @@
 
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
 	@list='$(pixmap_DATA)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
@@ -490,8 +489,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Applicationsdir) \
-		$(DESTDIR)$(mimedir) $(DESTDIR)$(pixmapdir) \
+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 \
 		$(DESTDIR)$(pkgdatadir)