From 3e7b4af3483131ebed0cf43fce368d1baf093d8a Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Fri, 18 Jan 2013 22:24:14 +0100
Subject: [PATCH] Installing the gallery tool by default

---
 Makefile             | 1 +
 data/Makefile        | 3 +++
 data/gallery.desktop | 8 ++++++++
 data/project.conf    | 5 ++++-
 tools/Makefile       | 3 +++
 tools/project.conf   | 1 +
 6 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 data/gallery.desktop

diff --git a/Makefile b/Makefile
index 649038f..5bc0a22 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ dist:
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
 		$(PACKAGE)-$(VERSION)/data/Makefile \
 		$(PACKAGE)-$(VERSION)/data/camera.desktop \
+		$(PACKAGE)-$(VERSION)/data/gallery.desktop \
 		$(PACKAGE)-$(VERSION)/data/project.conf \
 		$(PACKAGE)-$(VERSION)/src/camera.c \
 		$(PACKAGE)-$(VERSION)/src/main.c \
diff --git a/data/Makefile b/data/Makefile
index 434b786..4927fbe 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -14,8 +14,11 @@ distclean: clean
 install:
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL) -m 0644 -- camera.desktop $(DESTDIR)$(PREFIX)/share/applications/camera.desktop
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL) -m 0644 -- gallery.desktop $(DESTDIR)$(PREFIX)/share/applications/gallery.desktop
 
 uninstall:
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/camera.desktop
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/gallery.desktop
 
 .PHONY: all clean distclean install uninstall
diff --git a/data/gallery.desktop b/data/gallery.desktop
new file mode 100644
index 0000000..58ec6c7
--- /dev/null
+++ b/data/gallery.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Gallery
+Comment=Picture gallery
+Exec=gallery
+Icon=image-x-generic
+Type=Application
+Categories=Graphics;GTK;
+StartupNotify=true
diff --git a/data/project.conf b/data/project.conf
index 346c859..dd9912b 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,camera.desktop
+dist=Makefile,camera.desktop,gallery.desktop
 
 [camera.desktop]
 install=$(PREFIX)/share/applications
+
+[gallery.desktop]
+install=$(PREFIX)/share/applications
diff --git a/tools/Makefile b/tools/Makefile
index df4e198..138e585 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -34,7 +34,10 @@ distclean: clean
 	$(RM) -- $(TARGETS)
 
 install: $(TARGETS)
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 0755 -- gallery $(DESTDIR)$(BINDIR)/gallery
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(BINDIR)/gallery
 
 .PHONY: all clean distclean install uninstall
diff --git a/tools/project.conf b/tools/project.conf
index 029e9b8..7f29f04 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -7,3 +7,4 @@ dist=Makefile
 [gallery]
 type=binary
 sources=gallery.c
+install=$(BINDIR)