--- djvulibre-3.5.22/desktopfiles/Makefile.in.orig	2009-02-19 17:53:28.000000000 +0100
+++ djvulibre-3.5.22/desktopfiles/Makefile.in	2010-02-11 08:28:03.000000000 +0100
@@ -40,6 +40,9 @@
 datadir_djvu = ${datadir}/djvu/osi/desktop
 datadir_djview = ${datadir}/djvu/djview3/desktop
 
+desktopdir = /usr/share/applications
+iconsdir = /usr/share/icons
+mimedir = /usr/share/mime
 
 # -------- all
 
@@ -95,22 +98,16 @@
 @GUI_YES@install: install-djview-files
 
 install-djvu-files: FORCE
-	${INSTALL} -d ${DESTDIR}${datadir_djvu}
-	${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
-	${INSTALL_DATA} *djvu.png ${DESTDIR}${datadir_djvu}
-	${INSTALL_DATA} *djvu.svgz ${DESTDIR}${datadir_djvu}
-	${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
-	-@echo "Run ${datadir_djvu}/register-djvu-mime install"
-	-@echo " to register the djvu mime types and icons."
+	${INSTALL} -d ${DESTDIR}${mimedir}/packages ${DESTDIR}${iconsdir}/hicolor/{22x22,32x32,48x48}/{mimetypes,apps}
+	${INSTALL_DATA} ${srcdir}/hi22-djvu.png ${DESTDIR}${iconsdir}/hicolor/22x22/mimetypes/mime-image-vnd.djvu.png
+	${INSTALL_DATA} ${srcdir}/hi32-djvu.png ${DESTDIR}${iconsdir}/hicolor/32x32/mimetypes/mime-image-vnd.djvu.png
+	${INSTALL_DATA} ${srcdir}/hi48-djvu.png ${DESTDIR}${iconsdir}/hicolor/48x48/mimetypes/mime-image-vnd.djvu.png
+	#${INSTALL_DATA} ${srcdir}/djvulibre-mime.xml ${DESTDIR}${mimedir}/packages/djvulibre.xml
 
 install-djview-files: FORCE
-	${INSTALL} -d ${DESTDIR}${datadir_djview}
-	${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
-	${INSTALL_DATA} *djview3.png ${DESTDIR}${datadir_djview}
-	${INSTALL_DATA} *djview3.svgz ${DESTDIR}${datadir_djview}
-	${INSTALL_PROGRAM} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
-	-@echo "Run ${datadir_djview}/register-djview-menu install"
-	-@echo " to register the djview3 menu entries."
+	${INSTALL} -d ${DESTDIR}${desktopdir} ${DESTDIR}${iconsdir}/hicolor/{22x22,32x32,48x48}/{mimetypes,apps}
+	${INSTALL_DATA} ${srcdir}/hi32-djview3.png ${DESTDIR}${iconsdir}/hicolor/32x32/apps/djvulibre-djview3.png
+	${INSTALL_DATA} ${srcdir}/djvulibre-djview3.desktop ${DESTDIR}${desktopdir}/djvulibre-djview3.desktop
 
 
 # -------- misc