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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From 9ee8b6a522e2b1f731799690ac78da40f26e1bb7 Mon Sep 17 00:00:00 2001
From: Frederico Cadete <frederico.cadete@awtce.be>
Date: Wed, 8 Jun 2016 14:43:53 +0200
Subject: [PATCH] plugin conf file: rework to use @libdir@ from autotools
Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be>
---
Makefile.am | 15 ++++++++++++++-
config/pclCustomLibConfigFile.cfg | 8 --------
config/pclCustomLibConfigFile.cfg.in | 8 ++++++++
config/pclCustomLibConfigFileEmpty.cfg | 0
config/pclCustomLibConfigFileEmpty.cfg.in | 0
configure.ac | 1 +
6 files changed, 23 insertions(+), 9 deletions(-)
delete mode 100644 config/pclCustomLibConfigFile.cfg
create mode 100644 config/pclCustomLibConfigFile.cfg.in
delete mode 100644 config/pclCustomLibConfigFileEmpty.cfg
create mode 100644 config/pclCustomLibConfigFileEmpty.cfg.in
diff --git a/Makefile.am b/Makefile.am
index 51b4104..7e42f63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,15 +6,28 @@ SUBDIRS+=test
endif
# Write the config file for customer plugins to the config destination
-sysconf_DATA = config/pclCustomLibConfigFile.cfg \
+libconffiles = config/pclCustomLibConfigFile.cfg \
config/pclCustomLibConfigFileEmpty.cfg
+libconffiles_subst = $(SED) \
+ -e 's|@libdir[@]|$(libdir)|g'
+
+$(libconffiles):
+ $(libconffiles_subst) '$(abs_top_srcdir)/$@.in' > $@
+
+config/pclCustomLibConfigFile.cfg: config/pclCustomLibConfigFile.cfg.in
+config/pclCustomLibConfigFileEmpty.cfg: config/pclCustomLibConfigFileEmpty.cfg.in
+
# Add config file to distribution
+sysconf_DATA = $(libconffiles)
EXTRA_DIST = $(sysconf_DATA)
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=persistence_client_library.pc
+CLEANFILES = \
+ $(libconffiles)
+
MAINTAINERCLEANFILES = \
Makefile.in aclocal.m4 compile config.guess config.h.in config.sub \
configure depcomp install-sh ltmain.sh persistence_client_library.pc config.h.in~ Makefile missing
diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg
deleted file mode 100644
index 305cb7c..0000000
--- a/config/pclCustomLibConfigFile.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-hwinfo /usr/lib/libhwinfoperscustom.so init async
-secure /usr/lib/libsecureperscustom.so od sync
-custom3 /usr/lib/libcustom3perscustom.so init sync
-default /usr/lib/libpers_common.so.0 init sync
-emergency /usr/lib/libemergencyperscustom.so od async
-early /usr/lib/libearlyperscustom.so od sync
-anInvalidEntry /wrongPath/wrongLib do cnys
-custom2 /usr/lib/libcustom2perscustom.so init sync
diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in
new file mode 100644
index 0000000..8527211
--- /dev/null
+++ b/config/pclCustomLibConfigFile.cfg.in
@@ -0,0 +1,8 @@
+hwinfo @libdir@/libhwinfoperscustom.so init async
+secure @libdir@/libsecureperscustom.so od sync
+custom3 @libdir@/libcustom3perscustom.so init sync
+default @libdir@/libpers_common.so.0 init sync
+emergency @libdir@/libemergencyperscustom.so od async
+early @libdir@/libearlyperscustom.so od sync
+anInvalidEntry /wrongPath/wrongLib do cnys
+custom2 @libdir@/libcustom2perscustom.so init sync
diff --git a/config/pclCustomLibConfigFileEmpty.cfg b/config/pclCustomLibConfigFileEmpty.cfg
deleted file mode 100644
index e69de29..0000000
diff --git a/config/pclCustomLibConfigFileEmpty.cfg.in b/config/pclCustomLibConfigFileEmpty.cfg.in
new file mode 100644
index 0000000..e69de29
diff --git a/configure.ac b/configure.ac
index 2ae0042..649f9c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,7 @@ esac],
AM_CONDITIONAL(DEBUG, test x"$debug" = x"true")
+AC_PROG_SED
AC_CONFIG_FILES([Makefile
persistence_client_library.pc
--
1.9.1
|