From b83da71d89a7da1a12f83c4fc2a2b0bc900146ad Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 14 May 2018 17:26:06 +0200 Subject: [PATCH] build: move config/ to data/elementary/config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: this is part of the datadir distribution, it should not be in a different directory than the rest of the datadir distribution the gnu coding standards (https://www.gnu.org/prep/standards/html_node/Directory-Variables.html) define 'datadir' as: The directory for installing idiosyncratic read-only architecture-independent data files for this program. This is usually the same place as ‘datarootdir’, but we use the two separate variables so that you can move these program-specific files without altering the location for Info files, man pages, etc. This should normally be /usr/local/share, but write it as $(datarootdir). (If you are using Autoconf, write it as ‘@datadir@’.) The definition of ‘datadir’ is the same for all packages, so you should install your data in a subdirectory thereof. Most packages install their data under $(datadir)/package-name/. while this text has no clear requirement or suggestion for a corresponding repository layout, projects typically employ a certain consistency in their repository layout both for ease of maintenance and ease of learning for new contributors. this project has both a data/ directory, which contains the datadir distribution, as well as the config/ directory, which also contains the datadir distribution. this complicates matters both for active maintainers/developers who must remember that the repository and build tree layouts have this exception, and for new contributors who will initially be confused by this exception other well-organized open source projects, such as wayland, have chosen to not use a data/ directory. these projects have the datadir distribution in the base directory of the repositor, which is a fine practice as it maintains consistency for the project since all the files for the datadir distribution are in the same directory. by applying this patch, the project will move towards a more easily readable and learnable layout. current and future developers will no longer need to wonder why this directory is outside of the data/ directory, and anyone attempting to reference these files from the source/build trees will be able to do so more easily Reviewers: cedric, stefan_schmidt, raster Reviewed By: stefan_schmidt, raster Tags: #efl Differential Revision: https://phab.enlightenment.org/D6013 --- Makefile.am | 2 +- configure.ac | 14 +++++++------- data/Makefile.am | 3 +++ {config => data/elementary/config}/.gitignore | 0 {config => data/elementary/config}/Makefile.am | 6 +++--- .../elementary/config}/default/Makefile.am | 6 +++--- .../elementary/config}/default/base.src.in | 0 .../elementary/config}/default/icon.png | Bin .../elementary/config}/default/profile.desktop | 0 .../elementary/config}/mobile/Makefile.am | 6 +++--- .../elementary/config}/mobile/base.src.in | 0 .../elementary/config}/mobile/icon.png | Bin .../elementary/config}/mobile/profile.desktop | 0 {config => data/elementary/config}/profile.src | 0 .../elementary/config}/standard/Makefile.am | 6 +++--- .../elementary/config}/standard/base.src.in | 0 .../elementary/config}/standard/icon.png | Bin .../elementary/config}/standard/profile.desktop | 0 18 files changed, 23 insertions(+), 20 deletions(-) rename {config => data/elementary/config}/.gitignore (100%) rename {config => data/elementary/config}/Makefile.am (57%) rename {config => data/elementary/config}/default/Makefile.am (62%) rename {config => data/elementary/config}/default/base.src.in (100%) rename {config => data/elementary/config}/default/icon.png (100%) rename {config => data/elementary/config}/default/profile.desktop (100%) rename {config => data/elementary/config}/mobile/Makefile.am (63%) rename {config => data/elementary/config}/mobile/base.src.in (100%) rename {config => data/elementary/config}/mobile/icon.png (100%) rename {config => data/elementary/config}/mobile/profile.desktop (100%) rename {config => data/elementary/config}/profile.src (100%) rename {config => data/elementary/config}/standard/Makefile.am (62%) rename {config => data/elementary/config}/standard/base.src.in (100%) rename {config => data/elementary/config}/standard/icon.png (100%) rename {config => data/elementary/config}/standard/profile.desktop (100%) diff --git a/Makefile.am b/Makefile.am index e8624efc28..a753de855d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdunitdir=. \ --enable-always-build-examples -SUBDIRS = src data config doc +SUBDIRS = src data doc if HAVE_PO diff --git a/configure.ac b/configure.ac index 84ea995299..f2cb49fce1 100644 --- a/configure.ac +++ b/configure.ac @@ -5698,13 +5698,13 @@ esac AC_CONFIG_FILES([ Makefile data/Makefile -config/Makefile -config/default/Makefile -config/default/base.src -config/mobile/Makefile -config/mobile/base.src -config/standard/Makefile -config/standard/base.src +data/elementary/config/Makefile +data/elementary/config/default/Makefile +data/elementary/config/default/base.src +data/elementary/config/mobile/Makefile +data/elementary/config/mobile/base.src +data/elementary/config/standard/Makefile +data/elementary/config/standard/base.src doc/Makefile doc/Doxyfile doc/previews/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 74a025ef8f..6f409a3afe 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = CLEANFILES = +SUBDIRS = ######################################################################## # Embryo @@ -119,6 +120,8 @@ EXTRA_DIST += $(eluafiles_DATA) # themes +SUBDIRS += elementary/config + elementaryfilesdir = $(datadir)/elementary/themes elementaryfiles_DATA = elementary/themes/default.edj CLEANFILES += elementary/themes/default.edj diff --git a/config/.gitignore b/data/elementary/config/.gitignore similarity index 100% rename from config/.gitignore rename to data/elementary/config/.gitignore diff --git a/config/Makefile.am b/data/elementary/config/Makefile.am similarity index 57% rename from config/Makefile.am rename to data/elementary/config/Makefile.am index 690067909d..692651353e 100644 --- a/config/Makefile.am +++ b/data/elementary/config/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = default standard mobile -include ../src/Makefile_Eet_Helper.am +include ../../../src/Makefile_Eet_Helper.am EXTRA_DIST = profile.src @@ -11,8 +11,8 @@ files_DATA = profile.cfg %.cfg: %.src $(AM_V_EET) \ - $(MKDIR_P) $(top_builddir)/config/; \ - $(EET) -i $(top_builddir)/config/$@ config $< 0 + $(MKDIR_P) $(top_builddir)/data/elementary/config/; \ + $(EET) -i $(top_builddir)/data/elementary/config/$@ config $< 0 clean-local: rm -rf *.cfg *~ diff --git a/config/default/Makefile.am b/data/elementary/config/default/Makefile.am similarity index 62% rename from config/default/Makefile.am rename to data/elementary/config/default/Makefile.am index 6211ff7e1f..3986ae6b20 100644 --- a/config/default/Makefile.am +++ b/data/elementary/config/default/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../src/Makefile_Eet_Helper.am +include ../../../../src/Makefile_Eet_Helper.am EXTRA_DIST = \ profile.desktop \ @@ -15,8 +15,8 @@ files_DATA = \ %.cfg: %.src $(AM_V_EET) \ - $(MKDIR_P) $(top_builddir)/config/default/; \ - $(EET) -e $(top_builddir)/config/default/$@ config $< 1 + $(MKDIR_P) $(top_builddir)/data/elementary/config/default/; \ + $(EET) -e $(top_builddir)/data/elementary/config/default/$@ config $< 1 clean-local: rm -rf *.cfg *~ diff --git a/config/default/base.src.in b/data/elementary/config/default/base.src.in similarity index 100% rename from config/default/base.src.in rename to data/elementary/config/default/base.src.in diff --git a/config/default/icon.png b/data/elementary/config/default/icon.png similarity index 100% rename from config/default/icon.png rename to data/elementary/config/default/icon.png diff --git a/config/default/profile.desktop b/data/elementary/config/default/profile.desktop similarity index 100% rename from config/default/profile.desktop rename to data/elementary/config/default/profile.desktop diff --git a/config/mobile/Makefile.am b/data/elementary/config/mobile/Makefile.am similarity index 63% rename from config/mobile/Makefile.am rename to data/elementary/config/mobile/Makefile.am index 7cdfbd5881..2c6c9e2ef7 100644 --- a/config/mobile/Makefile.am +++ b/data/elementary/config/mobile/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../src/Makefile_Eet_Helper.am +include ../../../../src/Makefile_Eet_Helper.am EXTRA_DIST = \ profile.desktop \ @@ -15,8 +15,8 @@ files_DATA = \ %.cfg: %.src $(AM_V_EET) \ - $(MKDIR_P) $(top_builddir)/config/; \ - $(EET) -e $(top_builddir)/config/mobile/$@ config $< 1 + $(MKDIR_P) $(top_builddir)/data/elementary/config/; \ + $(EET) -e $(top_builddir)/data/elementary/config/mobile/$@ config $< 1 clean-local: rm -rf *.cfg *~ diff --git a/config/mobile/base.src.in b/data/elementary/config/mobile/base.src.in similarity index 100% rename from config/mobile/base.src.in rename to data/elementary/config/mobile/base.src.in diff --git a/config/mobile/icon.png b/data/elementary/config/mobile/icon.png similarity index 100% rename from config/mobile/icon.png rename to data/elementary/config/mobile/icon.png diff --git a/config/mobile/profile.desktop b/data/elementary/config/mobile/profile.desktop similarity index 100% rename from config/mobile/profile.desktop rename to data/elementary/config/mobile/profile.desktop diff --git a/config/profile.src b/data/elementary/config/profile.src similarity index 100% rename from config/profile.src rename to data/elementary/config/profile.src diff --git a/config/standard/Makefile.am b/data/elementary/config/standard/Makefile.am similarity index 62% rename from config/standard/Makefile.am rename to data/elementary/config/standard/Makefile.am index 3dd3c88c68..7ab55d0f80 100644 --- a/config/standard/Makefile.am +++ b/data/elementary/config/standard/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../src/Makefile_Eet_Helper.am +include ../../../../src/Makefile_Eet_Helper.am EXTRA_DIST = \ profile.desktop \ @@ -15,8 +15,8 @@ files_DATA = \ %.cfg: %.src $(AM_V_EET) \ - $(MKDIR_P) $(top_builddir)/config/standard/; \ - $(EET) -e $(top_builddir)/config/standard/$@ config $< 1 + $(MKDIR_P) $(top_builddir)/data/elementary/config/standard/; \ + $(EET) -e $(top_builddir)/data/elementary/config/standard/$@ config $< 1 clean-local: rm -rf *.cfg *~ diff --git a/config/standard/base.src.in b/data/elementary/config/standard/base.src.in similarity index 100% rename from config/standard/base.src.in rename to data/elementary/config/standard/base.src.in diff --git a/config/standard/icon.png b/data/elementary/config/standard/icon.png similarity index 100% rename from config/standard/icon.png rename to data/elementary/config/standard/icon.png diff --git a/config/standard/profile.desktop b/data/elementary/config/standard/profile.desktop similarity index 100% rename from config/standard/profile.desktop rename to data/elementary/config/standard/profile.desktop