[gnome-nibbles/wip/vala: 10/64] Fix installation of data files
- From: Iulian Radu <iulianradu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-nibbles/wip/vala: 10/64] Fix installation of data files
- Date: Sun, 9 Aug 2015 12:52:15 +0000 (UTC)
commit ad7b8546822dbe600a129d3ab3ab36966665447b
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Jun 27 10:16:58 2015 -0500
Fix installation of data files
data/Makefile.am | 2 ++
data/levels/Makefile.am | 7 ++-----
data/pix/Makefile.am | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 717429c..0fefeff 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = levels pix
+
gsettings_SCHEMAS = org.gnome.nibbles.gschema.xml
@GSETTINGS_RULES@
diff --git a/data/levels/Makefile.am b/data/levels/Makefile.am
index 559062b..751b759 100644
--- a/data/levels/Makefile.am
+++ b/data/levels/Makefile.am
@@ -1,5 +1,5 @@
-configdir = $(datadir)/gnome-nibbles/level
-config_DATA = \
+configdir = $(pkgdatadir)/levels
+dist_config_DATA = \
level001.gnl \
level002.gnl \
level003.gnl \
@@ -27,7 +27,4 @@ config_DATA = \
level025.gnl \
level026.gnl
-EXTRA_DIST = \
- $(config_DATA)
-
-include $(top_srcdir)/git.mk
diff --git a/data/pix/Makefile.am b/data/pix/Makefile.am
index 3e518b2..68d1459 100644
--- a/data/pix/Makefile.am
+++ b/data/pix/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir = $(pkgdatadir)/gnome-nibbles/pixmaps
+pixmapdir = $(pkgdatadir)/pixmaps
BONUS_PIX = \
bonus1.svg \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]