X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile.am;h=d7aaa75942445fcb024bc4aae6c3b5e1a92d89eb;hb=69037d6ddbe7e90d13d8a7a088d8c209a926190e;hp=0a4d4bc4a2d302e02cb14f9cc1cb3a4c78342e82;hpb=89426c885568df99413258f6365c08a3698539cf;p=xournal.git

diff --git a/Makefile.am b/Makefile.am
index 0a4d4bc..d7aaa75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src
+SUBDIRS = src po
 
 EXTRA_DIST = \
 	autogen.sh \
-	xournal.glade \
-	xournal.gladep \
-	maemo/xournal.desktop \
-	maemo/xournal.service
+	xournal.glade xournal.gladep \
+	xournal.xml x-xoj.desktop xournal.desktop
 
 install-data-local:
 	@$(NORMAL_INSTALL)
@@ -29,6 +27,66 @@ install-data-local:
 	  if test ! -e $(DESTDIR)$(pkgdatadir)/html-doc/pixmaps; then \
 	    ln -s ../pixmaps $(DESTDIR)$(pkgdatadir)/html-doc/pixmaps; \
 	  fi \
+	fi; \
+	echo "*** Desktop files, icons, MIME types not installed. Run 'make desktop-install'"; \
+	echo "*** (or 'make home-desktop-install' for installation in a home directory)."
+
+desktop-install:
+	if test "$(datadir)" = "/usr/share"; then \
+	  desktopdir=/usr/share; \
+	else \
+	  desktopdir=/usr/local/share; \
+	fi; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/applications; \
+	$(mkinstalldirs) $(DESTDIR)/usr/share/mimelnk/application; \
+	$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
+	$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
+	if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
+	  ln -s xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; \
+	fi; \
+	$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
+	$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
+	$(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)/usr/share/mimelnk/application; \
+	if test -z "$(DESTDIR)"; then \
+	  echo "Updating desktop, mime, and icon databases."; \
+	  update-desktop-database; \
+	  update-mime-database $$desktopdir/mime; \
+	  gtk-update-icon-cache -f -t $$desktopdir/icons/hicolor; \
+	else \
+	  echo "*** Not updating desktop, mime, and icon databases. After install, run:"; \
+	  echo "***   update-desktop-database"; \
+	  echo "***   update-mime-database $$desktopdir/mime"; \
+	  echo "***   gtk-update-icon-cache -f -t $$desktopdir/icons/hicolor"; \
+	fi
+
+home-desktop-install:
+	desktopdir=$(HOME)/.local/share; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
+	$(mkinstalldirs) $(DESTDIR)$$desktopdir/applications; \
+	$(mkinstalldirs) $(DESTDIR)$(HOME)/.kde/share/mimelnk/application; \
+	$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
+	$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
+	if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
+	  ln -s xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; \
+	fi; \
+	$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
+	$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
+	$(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)$(HOME)/.kde/share/mimelnk/application; \
+	if test -z "$(DESTDIR)"; then \
+	  echo "Updating desktop, mime, and icon databases."; \
+	  XDG_DATA_DIRS=$(HOME)/.local/share update-desktop-database; \
+	  update-mime-database $$desktopdir/mime; \
+	  gtk-update-icon-cache -f -t $$desktopdir/icons/hicolor; \
+	else \
+	  echo "*** Not updating desktop, mime, and icon databases. After install, run:"; \
+	  echo "***   update-desktop-database"; \
+	  echo "***   update-mime-database $$desktopdir/mime"; \
+	  echo "***   gtk-update-icon-cache -f -t $$desktopdir/icons/hicolor"; \
 	fi
 
 dist-hook:
@@ -52,10 +110,3 @@ dist-hook:
 	  fi \
 	fi
 
-if USE_HILDON
-desktopdir = $(datadir)/applications/hildon
-desktop_DATA = maemo/xournal.desktop 
-
-servicedir = $(libdir)/dbus-1.0/services
-service_DATA = maemo/xournal.service
-endif