summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Huerner <ingo_huerner@mentor.com>2015-10-29 11:59:20 +0100
committerIngo Huerner <ingo_huerner@mentor.com>2015-10-29 11:59:20 +0100
commit6b208bfc268890360fcbd5cede70da5d2f9fb459 (patch)
treed1f0c4cd3bd93b1e1a7a942be33778e9b6915745
parent8e27db0200ae7c01155780329f2b62d53e18c3cc (diff)
downloadpersistence-client-library-6b208bfc268890360fcbd5cede70da5d2f9fb459.tar.gz
PCL plugin conf file is now configurable (Bug 407)
-rw-r--r--Makefile.am2
-rw-r--r--config/pclCustomLibConfigFile.cfg8
-rw-r--r--config/pclCustomLibConfigFile.cfg.in8
-rw-r--r--config/pclCustomLibConfigFileEmpty.cfg.in (renamed from config/pclCustomLibConfigFileEmpty.cfg)0
-rw-r--r--configure.ac2
5 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 51b4104..e9fd428 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,4 @@ pkgconfig_DATA=persistence_client_library.pc
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
+ configure depcomp install-sh ltmain.sh persistence_client_library.pc config/pclCustomLibConfigFile.cfg config/pclCustomLibConfigFileEmpty.cfg config.h.in~ Makefile missing
diff --git a/config/pclCustomLibConfigFile.cfg b/config/pclCustomLibConfigFile.cfg
deleted file mode 100644
index fe95ea0..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.1 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 \ No newline at end of file
diff --git a/config/pclCustomLibConfigFile.cfg.in b/config/pclCustomLibConfigFile.cfg.in
new file mode 100644
index 0000000..185cab4
--- /dev/null
+++ b/config/pclCustomLibConfigFile.cfg.in
@@ -0,0 +1,8 @@
+hwinfo @prefix@/lib/libhwinfoperscustom.so init async
+secure @prefix@/lib/libsecureperscustom.so od sync
+custom3 @prefix@/lib/libcustom3perscustom.so init sync
+default @prefix@/lib/libpers_common.so init sync
+emergency @prefix@/lib/libemergencyperscustom.so od async
+early @prefix@/lib/libearlyperscustom.so od sync
+anInvalidEntry /wrongPath/wrongLib do cnys
+custom2 @prefix@/lib/libcustom2perscustom.so init sync
diff --git a/config/pclCustomLibConfigFileEmpty.cfg b/config/pclCustomLibConfigFileEmpty.cfg.in
index e69de29..e69de29 100644
--- a/config/pclCustomLibConfigFileEmpty.cfg
+++ b/config/pclCustomLibConfigFileEmpty.cfg.in
diff --git a/configure.ac b/configure.ac
index 2ae0042..272bd54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,8 @@ AM_CONDITIONAL(DEBUG, test x"$debug" = x"true")
AC_CONFIG_FILES([Makefile
persistence_client_library.pc
+ config/pclCustomLibConfigFile.cfg
+ config/pclCustomLibConfigFileEmpty.cfg
src/Makefile
persclient_tool/Makefile
test/Makefile])