From 63a17d8da183eef49416cb01657ab6e27cd20254 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Wed, 9 Apr 2014 22:58:07 -0400
Subject: [PATCH] Move application data files to data folder

---
 Makefile.am                       |  7 +------
 configure.ac                      | 17 +++++++++--------
 data/Makefile.am                  | 10 ++++++++++
 grip.desktop => data/grip.desktop |  0
 grip.spec.in => data/grip.spec.in |  0
 5 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 data/Makefile.am
 rename grip.desktop => data/grip.desktop (100%)
 rename grip.spec.in => data/grip.spec.in (100%)

diff --git a/Makefile.am b/Makefile.am
index e76aadc..ec5ddf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,11 @@
 .PHONY: changelog
 
-SUBDIRS = po src pixmaps doc contrib
+SUBDIRS = data po src pixmaps doc contrib
 
 EXTRA_DIST = \
-    grip.desktop \
     CREDITS \
-    grip.spec.in \
     autogen.sh
 
-Applicationsdir = $(datadir)/applications
-Applications_DATA = grip.desktop
-
 ACLOCAL_AMFLAGS = -I m4
 
 LIBTOOL_MACROS = \
diff --git a/configure.ac b/configure.ac
index 20284f2..a1bf393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,12 +159,13 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(ac_aux_dir)
 
 AC_OUTPUT([
-Makefile
-grip.spec
-src/Makefile
-po/Makefile.in
-pixmaps/Makefile
-doc/Makefile
-doc/images/Makefile
-contrib/Makefile
+    Makefile
+    data/grip.spec
+    data/Makefile
+    src/Makefile
+    po/Makefile.in
+    pixmaps/Makefile
+    doc/Makefile
+    doc/images/Makefile
+    contrib/Makefile
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..3cf4b08
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,10 @@
+
+EXTRA_DIST = \
+    grip.desktop \
+    grip.spec.in
+
+Applicationsdir = $(datadir)/applications
+Applications_DATA = grip.desktop
+
+MAINTAINERCLEANFILES = \
+    Makefile.in
diff --git a/grip.desktop b/data/grip.desktop
similarity index 100%
rename from grip.desktop
rename to data/grip.desktop
diff --git a/grip.spec.in b/data/grip.spec.in
similarity index 100%
rename from grip.spec.in
rename to data/grip.spec.in
-- 
2.20.1