build: Move data files to data/

9 files changed, 13 insertions, 13 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91885959..1f916fd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ build:
     - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
   script:
     # Generate spec
-    - xmlto -o shared-mime-info-spec-html/ html-nochunks shared-mime-info-spec.xml
+    - xmlto -o shared-mime-info-spec-html/ html-nochunks data/shared-mime-info-spec.xml
     # Compile xdgmime
     - git clone https://gitlab.freedesktop.org/xdg/xdgmime.git
     - cd xdgmime
diff --git a/Makefile.am b/Makefile.am
index 3927d515..aba70383 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,13 +22,13 @@ test_tree_magic_CFLAGS = $(GIO_CFLAGS)
 test_tree_magic_LDADD = $(GIO_LIBS)
 endif
 
-man_MANS = update-mime-database.1
+man_MANS = data/update-mime-database.1
 
-ITS_FILES = its/shared-mime-info.loc its/shared-mime-info.its
+ITS_FILES = data/its/shared-mime-info.loc data/its/shared-mime-info.its
 
 EXTRA_DIST = \
-	shared-mime-info-spec.xml	\
-	freedesktop.org.xml.in		\
+	data/shared-mime-info-spec.xml	\
+	data/freedesktop.org.xml.in	\
 	src/test-tree-magic.c		\
 	$(packages_DATA) 		\
 	README				\
@@ -44,9 +44,9 @@ pkgconfig_DATA = shared-mime-info.pc
 
 $(pkgconfig_DATA): config.status
 
-freedesktop.org.xml: freedesktop.org.xml.in $(top_srcdir)/po/*.po its/shared-mime-info.its
+freedesktop.org.xml: data/freedesktop.org.xml.in $(top_srcdir)/po/*.po data/its/shared-mime-info.its
 	$(MAKE) -C po update-gmo
-	$(AM_V_GEN)$(ITSTOOL) --its $(top_srcdir)/its/shared-mime-info.its -j $< -o $@ $(top_srcdir)/po/*.gmo
+	$(AM_V_GEN)$(ITSTOOL) --its $(top_srcdir)/data/its/shared-mime-info.its -j $< -o $@ $(top_srcdir)/po/*.gmo
 
 if CROSS_COMPILING
   update_mime_database=$(UPDATE_MIME_DATABASE)
@@ -80,7 +80,7 @@ all: $(defaultmakedeps)
 
 XDGMIME_PATH=@XDGMIME_PATH@
 
-po/shared-mime-info.pot: freedesktop.org.xml.in $(top_srcdir)/po/*.po
+po/shared-mime-info.pot: data/freedesktop.org.xml.in $(top_srcdir)/po/*.po
 	make -C po shared-mime-info.pot
 
 local-test: po/shared-mime-info.pot freedesktop.org.xml update-mime-database$(EXEEXT)
@@ -126,14 +126,14 @@ else
 			rm -rf "$(top_builddir)/temp-mime-dir/" ; \
 		fi; \
 	fi
-	@if test x`grep '<mime-type' $(srcdir)/freedesktop.org.xml.in | tr -d '[:blank:]' | sort | uniq -d` != "x"; then \
+	@if test x`grep '<mime-type' $(srcdir)/data/freedesktop.org.xml.in | tr -d '[:blank:]' | sort | uniq -d` != "x"; then \
 		echo "*************************************************************" ; \
 		echo "*** Some mime-types are duplicated, fix before committing ***" ; \
 		echo "*************************************************************" ; \
 		exit 1 ; \
 	fi
-	@echo Number of mime-types that might need generic-icon: `grep "mime-type type=" $(srcdir)/freedesktop.org.xml.in | grep -v video/ | grep -v image/ | grep -v text/ | grep -v audio/ | grep -v "octet-stream" | wc -l` ; \
-	echo Number of mime-types with a generic icon: `grep "generic-icon name=" $(srcdir)/freedesktop.org.xml.in | wc -l` ;
+	@echo Number of mime-types that might need generic-icon: `grep "mime-type type=" $(srcdir)/data/freedesktop.org.xml.in | grep -v video/ | grep -v image/ | grep -v text/ | grep -v audio/ | grep -v "octet-stream" | wc -l` ; \
+	echo Number of mime-types with a generic icon: `grep "generic-icon name=" $(srcdir)/data/freedesktop.org.xml.in | wc -l` ;
 endif
 
 check-translations:
diff --git a/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index bcac00f4..bcac00f4 100644
--- a/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
diff --git a/its/shared-mime-info.its b/data/its/shared-mime-info.its
index e504a273..e504a273 100644
--- a/its/shared-mime-info.its
+++ b/data/its/shared-mime-info.its
diff --git a/its/shared-mime-info.loc b/data/its/shared-mime-info.loc
index a6f7f409..a6f7f409 100644
--- a/its/shared-mime-info.loc
+++ b/data/its/shared-mime-info.loc
diff --git a/shared-mime-info-spec.xml b/data/shared-mime-info-spec.xml
index f0a6fe39..f0a6fe39 100644
--- a/shared-mime-info-spec.xml
+++ b/data/shared-mime-info-spec.xml
diff --git a/update-mime-database.1 b/data/update-mime-database.1
index b18eac3b..b18eac3b 100644
--- a/update-mime-database.1
+++ b/data/update-mime-database.1
diff --git a/po/Makevars b/po/Makevars
index ec459209..ef0a1bac 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # This allows us using local its files
-XGETTEXT := env GETTEXTDATADIRS="$(top_srcdir)/" $(XGETTEXT)
+XGETTEXT := env GETTEXTDATADIRS="$(top_srcdir)/data" $(XGETTEXT)
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88fa57bd..1518cf4e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1 @@
-freedesktop.org.xml.in
+data/freedesktop.org.xml.in