diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-06-13 12:15:56 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-06-13 12:15:56 +1200 |
| commit | 497d82f6c4f068672c8f00df69f9848eca22aaa7 (patch) | |
| tree | 12e2eaff052fe04c2d7985407d618d3319b44464 /data | |
| parent | 33d9815eeb087e308657a3d3bfcc49c9b16a17c5 (diff) | |
| download | lightdm-git-497d82f6c4f068672c8f00df69f9848eca22aaa7.tar.gz | |
Merge data/init/Makefile.am into data/Makefile.am
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/init/Makefile.am | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 2c4fd420..6ed72a9e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS = init +initdir = ${sysconfdir}/init +dist_init_DATA = init/lightdm.conf confdir = $(sysconfdir)/lightdm dist_conf_DATA = lightdm.conf users.conf keys.conf diff --git a/data/init/Makefile.am b/data/init/Makefile.am deleted file mode 100644 index 5383af38..00000000 --- a/data/init/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -initdir = ${sysconfdir}/init -dist_init_DATA = lightdm.conf - -DISTCLEANFILES = \ - Makefile.in |