[ghex] Moved ghex.desktop.in, ghex2.schemas, gtkhex.pc.in to 'data' subdir

[Kalev Lember <klember src gnome org>]

commit b583b6745126cdf96b4a2f19c9725133fc3cd4aa
Author: Kalev Lember <kalevlember gmail com>
Date:   Thu Aug 4 10:19:23 2011 +0300

    Moved ghex.desktop.in, ghex2.schemas, gtkhex.pc.in to 'data' subdir

 Makefile.am                             |   29 ++---------------------------
 configure.ac                            |    3 ++-
 data/Makefile.am                        |   26 ++++++++++++++++++++++++++
 ghex.desktop.in => data/ghex.desktop.in |    0
 ghex2.schemas => data/ghex2.schemas     |    0
 gtkhex.pc.in => data/gtkhex.pc.in       |    0
 po/POTFILES.in                          |    2 +-
 7 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ccf0733..c2b0f2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,41 +4,16 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-schemas-install
 
-SUBDIRS = po help src icons
-
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = ghex2.schemas
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtkhex.pc
+SUBDIRS = data po help src icons
 
 EXTRA_DIST =			\
-	ghex.desktop.in		\
 	gnome-doc-utils.make	\
 	omf.make		\
 	xmldocs.make		\
 	COPYING-DOCS    	\
 	intltool-extract.in	\
 	intltool-merge.in	\
-	intltool-update.in	\
-	$(schema_DATA)
-
-desktopdir = $(datadir)/applications
-desktop_in_files = ghex.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
- INTLTOOL_DESKTOP_RULE@
-
-#Install the ghex2 schema file
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-else
-install-data-local:
-endif
-
-CLEANFILES =			\
-	$(desktop_DATA)
+	intltool-update.in
 
 DISTCLEANFILES =		\
 	intltool-extract	\
diff --git a/configure.ac b/configure.ac
index 4a53ded..0f868fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,7 @@ GNOME_DOC_INIT([0.9.0],,
 
 AC_CONFIG_FILES([
 Makefile
+data/Makefile
 po/Makefile.in
 src/Makefile
 help/Makefile
@@ -94,5 +95,5 @@ icons/22x22/Makefile
 icons/24x24/Makefile
 icons/32x32/Makefile
 icons/48x48/Makefile
-gtkhex.pc])
+data/gtkhex.pc])
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..325f392
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,26 @@
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = ghex2.schemas
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gtkhex.pc
+
+EXTRA_DIST =			\
+	ghex.desktop.in		\
+	$(schema_DATA)
+
+desktopdir = $(datadir)/applications
+desktop_in_files = ghex.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_DESKTOP_RULE@
+
+#Install the ghex2 schema file
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+else
+install-data-local:
+endif
+
+CLEANFILES =			\
+	$(desktop_DATA)
diff --git a/ghex.desktop.in b/data/ghex.desktop.in
similarity index 100%
rename from ghex.desktop.in
rename to data/ghex.desktop.in
diff --git a/ghex2.schemas b/data/ghex2.schemas
old mode 100755
new mode 100644
similarity index 100%
rename from ghex2.schemas
rename to data/ghex2.schemas
diff --git a/gtkhex.pc.in b/data/gtkhex.pc.in
similarity index 100%
rename from gtkhex.pc.in
rename to data/gtkhex.pc.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 39727de..893c3c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-ghex.desktop.in
+data/ghex.desktop.in
 src/chartable.c
 src/config.c
 src/converter.c