Commit Graph

47 Commits

Author SHA1 Message Date
Mike Blumenkrantz 05d3f2d393 move config/ to data/config/
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 (
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

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

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

ref D6013

Reviewers: cedric, raster, bu5hm4n

Reviewed By: raster

Subscribers: devilhorns

Tags: #enlightenment-git

Differential Revision:
2018-05-15 15:30:14 +02:00
Carsten Haitzler 76eeffa2f6 build - make pam a requirement on non-bsd unless disabled
this shou,ld provide a compile failure for when no pam headers are
found and thus pam not enabled if we need pam for auth (i.e. linux).
so it'll be harder to foot-shoot now.also an add-on fix to T6779
2018-03-20 18:53:15 +09:00
Al Poole 672b4a5657 Revert " set PKG_SYSCONF_DIR properly."
This wasn't broken. Use --sysconfdir instead!

This reverts commit 1469289701.
2018-03-11 16:43:51 +00:00
Al Poole 1469289701 set PKG_SYSCONF_DIR properly.
@fix T6734
2018-03-11 11:41:40 +00:00
Mike Blumenkrantz 727b1cd902 bump efl version req 2018-02-06 11:17:02 -05:00
Marcel Hollerbach 39c9ae8b73 build: enter po subdir
the option is handled inside
2018-01-23 19:25:46 +01:00
Mike Blumenkrantz cf75b9ed1c bump wayland-protocols version requirement 2018-01-10 11:38:53 -05:00
Al Poole 481a4d6611 build: fix meson build on FreeBSD.
Summary: -Dsystemd=false and -Ddevice-udev=false with this.

Reviewers: raster, zmike!

Subscribers: cedric

Differential Revision:

Signed-off-by: Cedric BAIL <>
2017-12-15 11:32:20 -08:00
Stefan Schmidt ff9831e2e4 meson: make it possible to set the path for eldbus-codegen
find_program() did not detect the eldbus-codegen binary in a given
prefix. Which is a situation we have on Jenkins builds. Make it an
option that can be set like we already do with edje_cc.
If there is a more meson-like approach to this I do not know feel free
to enlight me.
2017-11-23 16:00:28 +01:00
Marcel Hollerbach 9bbb2db6ea meson: this version is enough for the things we use in the moment
this makes meson build work on ubuntu 17.04
2017-11-04 10:43:10 +00:00
Mike Blumenkrantz f4470e002e add gadget sandboxing
docs in progress, tasks
2017-11-03 11:47:35 -04:00
Mike Blumenkrantz d4ea0987fe bump versions for e23 development cycle 2017-11-02 09:09:38 -04:00
Mike Blumenkrantz def59e42c2 unset release mode 2017-11-02 09:08:07 -04:00
Mike Blumenkrantz 7db6157779 0.22.0 release 2017-11-02 08:58:50 -04:00
Mike Blumenkrantz aee4c2ef73 unset release mode 2017-10-23 09:30:05 -04:00
Mike Blumenkrantz c83fc089a7 22.0-rc release 2017-10-23 08:36:23 -04:00
Mike Blumenkrantz 674d5c4694 require efl 1.20.5 2017-10-20 14:36:07 -04:00
Mike Blumenkrantz 4845823d74 make some find_program() calls non-required in meson build
reported by wltjr
2017-10-20 13:40:20 -04:00
Mike Blumenkrantz d1cac14aee unset release mode 2017-09-29 13:45:21 -04:00
Mike Blumenkrantz 687848ce42 22.0-beta release 2017-09-29 13:08:41 -04:00
Mike Blumenkrantz 9f6d50ddf8 fix meson wayland-only detection when xwayland is enabled 2017-09-22 11:53:15 -04:00
Mike Blumenkrantz 2f51262833 fix typo in finding chmod meson script
ref d70ab09a4a
2017-09-21 20:59:05 -04:00
Mike Blumenkrantz e121c1083c require efl 1.20.4+ 2017-09-21 13:31:01 -04:00
Mike Blumenkrantz d70ab09a4a move into meson/ 2017-09-21 13:31:01 -04:00
Mike Blumenkrantz d2a7a1ece7 install wayland session file
fix T4885
2017-09-13 11:43:51 -04:00
Mike Blumenkrantz 2f9b8beedc unset release mode 2017-09-13 10:59:23 -04:00
Mike Blumenkrantz e02512bed4 22.0-alpha release 2017-09-13 10:53:11 -04:00
Mike Blumenkrantz f73e37655e bump efl version reqs to 1.20.3
this will need to be 1.20.4 soon
2017-09-12 13:22:23 -04:00
Derek Foreman 9c23fbaf28 Drop wayland-protocols requirement to 1.9
This is blocking people from using it, and we don't actually support
anything 1.10 added (xdg-outputs) yet
2017-09-01 08:48:36 -05:00
Carsten Haitzler 074b3fe1eb e - add vkbd for convertibles (tablets, laptops ... phones) 2017-08-20 01:01:58 +09:00
Derek Foreman 55e13da654 Bump wayland-protocols requirement
We need a newer version for the dmabuf changes, so let's just depend on the
latest released.
2017-08-14 11:22:18 -05:00
Mike Blumenkrantz 64a1251de7 add wayland variable to pkgconfig
modules should be able to detect whether wayland support is available
2017-08-11 18:48:49 -04:00
Derek Foreman 022dd52cd9 Remove more pre-ecore-drm2 stuff
We no longer need a HAVE_DRM2 define since it's become synonymous with
2017-08-10 13:32:15 -05:00
Carsten Haitzler c80766dfa2 e meson build - refactor and clean up config and some module only cfg
config that is only needed fro modules only needs to be don in the
modules subdir i tried doing what modules do but output
files cant have paths.
2017-08-10 23:14:12 +09:00
Marcel Hollerbach 4af2976a54 meson: add HAVE_DRM2 and HAVE_WL_DRM
for now i just added HAVE_WL_DRM but its just the same as
USE_MODULE_WL_DRM, maybe we can replace HAVE_WL_DRM once autotools is
gone, so we have a clear pattern.
2017-08-10 15:31:33 +02:00
Carsten Haitzler f9dae2400c move sysaction specific configure val detection to the etc subdir 2017-08-10 14:47:12 +09:00
Carsten Haitzler c87d70eb9a meson build - do a little tidying of the main in root
this will need further work. i want to try and trim this down as much
as i can and make it easy to read/follow and see mistakes (thus the
aligning or afgs in many places)
2017-07-30 17:35:24 +09:00
Carsten Haitzler 6ab9c576df meosn build modules - more modules build with the generic builder harness
module build files are so much simpler now...
2017-07-30 17:07:57 +09:00
Carsten Haitzler 69290dd7f4 e module build - make build files far more generic and far smaller
now mdoule build files that fllow one pattern (the most common by far)
all JUSt list their souce files and nothing else. this really cuts
down on build size/complexity.

there are other patterns too (no icons at all) that i'll do next, then
we're down into "weird" land where i'll have to think of some more
interesting ways to deal with this.
2017-07-29 08:55:36 +09:00
Carsten Haitzler 3932a069f7 build - remove policy mobile module
this module is not loaded by any other (dependency) nor is it loadable
via the gui - no module/desktop there thus will be hidden... so it's
useless/unused... thus remove it as its not usable by users.
2017-07-27 20:23:59 +09:00
Carsten Haitzler ce3b72e371 meson build generics - ooops. missed files. add now 2017-07-27 18:32:43 +09:00
Carsten Haitzler 822a0bcacb e module build - make ibar and clock really simple and generic
now their build fiels are super easy to maintan. we should expand this
kind of ptterning aross the e build and then expand it to handle new
patters where needed like custom binaries (setuid or not), etc etc.
2017-07-27 18:30:11 +09:00
Carsten Haitzler 072bd77929 doc - add doc dir content to meson install to match prev autofoo 2017-07-27 14:30:53 +09:00
Carsten Haitzler 241d42ccf2 e meson build - fix PACKAGE_DATA_DIR to include project name at end
it used to include it with autofoo... it should continue to include
it. don't break things. is /usr/local/share/enlightenment .... is what
PKG_DATA_DIR would be defined as (assuming default prefix).
2017-07-23 17:13:14 +09:00
Carsten Haitzler 3126f103f0 meson - fix config install to install cfg files in right places and perms
cfg files were installed on top of eachother in the wrong directories
and they were unreadable by anyone but root (if you sudo make
install)... so fix this with my new chmod fixing stuff (yes meson
doesnt let you specific permissions for custom targets).
2017-07-22 14:41:24 +09:00
Mike Blumenkrantz eaebd704a9 abort meson build if source tree is not clean 2017-07-21 14:43:37 -04:00
Mike Blumenkrantz e8dc71cd48 meson. 2017-07-20 17:18:33 -04:00