Merge data/init/Makefile.am into data/Makefile.am

diff --git a/configure.ac b/configure.ac
index 58f8ff21983555a1c487e658db6d3464f64c81e1..416f533cf8f655842f4e1824e6fe4a747af94070 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,6 @@ dnl ###########################################################################
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/init/Makefile
 doc/Makefile
 help/Makefile
 liblightdm-gobject/liblightdm-gobject-1.pc

diff --git a/data/Makefile.am b/data/Makefile.am
index 2c4fd420f9b344343e3a0c359badc572de7852f6..6ed72a9e3c2c63c862e72653cff000c79f3df58b 100644 (file)
--- 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 (file)
index 5383af3..0000000
--- a/data/init/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-initdir = ${sysconfdir}/init
-dist_init_DATA = lightdm.conf
-
-DISTCLEANFILES = \
-       Makefile.in