1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 0ea0329f2c19a43acdc8444fa89e233ba617973d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 6 Oct 2014 13:06:24 +0200
Subject: [PATCH] let autotools create lxdm.conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
in out of tree builds lxdm.conf is empty
Upstream-Status: submitted [1]
[1] http://sourceforge.net/p/lxde/mailman/message/32901417/
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 1 +
data/Makefile.am | 5 -----
data/lxdm.conf.in | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index f28c89a..a2fff5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,7 @@ AC_CONFIG_FILES([
data/PreReboot
data/PreShutdown
data/LoginReady
+ data/lxdm.conf
])
AC_CONFIG_FILES([data/lxdm], [chmod +x data/lxdm])
AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 9500da9..ad64b11 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,3 @@
-FULL_LIBEXECDIR=$(libexecdir)
-
-lxdm.conf: lxdm.conf.in
- cat lxdm.conf.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@
-
NULL=
sbin_SCRIPTS = lxdm
diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
index d93f280..6206262 100644
--- a/data/lxdm.conf.in
+++ b/data/lxdm.conf.in
@@ -19,7 +19,7 @@
# skip_password=1
## greeter used to welcome the user
-greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
+greeter=@libexecdir@/lxdm-greeter-gtk
[server]
## arg used to start xserver, not fully function
--
1.8.3.1
|
