1From 48b6bcf9f5d8a05eace4bc463c47e8a4715d3000 Mon Sep 17 00:00:00 2001
2From: iddinev <xidinev@gmail.com>
3Date: Mon, 18 Mar 2019 15:45:20 +0200
4Subject: [PATCH] Proper macro path generation.
5
6Signed-off-by: iddinev <xidinev@gmail.com>
7---
8 libutempter/iface.c | 7 +++----
9 1 file changed, 3 insertions(+), 4 deletions(-)
10
11diff --git libutempter/iface.c libutempter/iface.c
12index 27793f0..c1c0ee9 100644
13--- libutempter/iface.c
14+++ libutempter/iface.c
15@@ -44,13 +44,12 @@
16 #endif
17
18 #ifdef  LIBEXECDIR
19-#  define CAT_PATH(DIR1,DIR2)           DIR1##DIR2
20-#  define RAW_UTEMPTER_PATH             CAT_PATH(LIBEXECDIR,/utempter/utempter)
21+#  define UTEMPTER_DEFAULT_PATHNAME     XSTR_PATH(LIBEXECDIR)"/utempter/utempter"
22 #else
23-#  define RAW_UTEMPTER_PATH             /usr/lib/libtempter/utempter/utempter
24+#  define UTEMPTER_DEFAULT_PATHNAME     STR_PATH(/usr/lib/libtempter/utempter/utempter)
25 #endif
26 #define STR_PATH(RAW_STR)               #RAW_STR
27-#define UTEMPTER_DEFAULT_PATHNAME       STR_PATH(RAW_UTEMPTER_PATH)
28+#define XSTR_PATH(STR)                  STR_PATH(STR)
29
30 static const char *utempter_pathname;
31 static int saved_fd = -1;
32--
332.7.4
34
35