build: move config/ to data/elementary/config

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
devs/derekf/wayland
Mike Blumenkrantz 5 years ago committed by Stefan Schmidt
parent 8c14de8541
commit b83da71d89
  1. 2
      Makefile.am
  2. 14
      configure.ac
  3. 3
      data/Makefile.am
  4. 0
      data/elementary/config/.gitignore
  5. 6
      data/elementary/config/Makefile.am
  6. 6
      data/elementary/config/default/Makefile.am
  7. 0
      data/elementary/config/default/base.src.in
  8. 0
      data/elementary/config/default/icon.png
  9. 0
      data/elementary/config/default/profile.desktop
  10. 6
      data/elementary/config/mobile/Makefile.am
  11. 0
      data/elementary/config/mobile/base.src.in
  12. 0
      data/elementary/config/mobile/icon.png
  13. 0
      data/elementary/config/mobile/profile.desktop
  14. 0
      data/elementary/config/profile.src
  15. 6
      data/elementary/config/standard/Makefile.am
  16. 0
      data/elementary/config/standard/base.src.in
  17. 0
      data/elementary/config/standard/icon.png
  18. 0
      data/elementary/config/standard/profile.desktop

@ -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

@ -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

@ -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

@ -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 *~

@ -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 *~

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

@ -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 *~

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

@ -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 *~

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Loading…
Cancel
Save