From cc2105b2b261f557838fec640d201d93f4c89665 Mon Sep 17 00:00:00 2001 From: me_laptop Date: Thu, 9 Aug 2012 19:50:09 +0000 Subject: default installation prefix git-svn-id: svn://localhost/project_picapica/trunk@158 fb96df88-216d-11de-830c-f3023f12d8ac --- Makefile.am | 4 ++++ PICA_nodeconfig.h | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c9cb3aa..df6cc2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,4 +10,8 @@ pica_node_SOURCES = PICA_node.c PICA_msgproc.c PICA_nodeaddrlist.c \ dist_man_MANS = pica-node.8 pica-node.conf.5 +pica_node_CPPFLAGS = -DPICA_PREFIX=\"$(prefix)\" + +dist_pkgdata_DATA = CA.pem + diff --git a/PICA_nodeconfig.h b/PICA_nodeconfig.h index bbb2f1d..52e00b7 100644 --- a/PICA_nodeconfig.h +++ b/PICA_nodeconfig.h @@ -2,13 +2,15 @@ #ifndef PICA_NODECONFIG_H #define PICA_NODECONFIG_H -//FIXME these default values should be set by "configure" script -//FIXME put these macros inside man pages and substitute them using sed during "make install" +#ifndef PICA_PREFIX +#define PICA_PREFIX "/usr" +#endif + #define PICA_NODECONFIG_DEF_ANNOUNCED_ADDR "0.0.0.0" -#define PICA_NODECONFIG_DEF_LISTEN_PORT 2299 +#define PICA_NODECONFIG_DEF_LISTEN_PORT "2299" #define PICA_NODECONFIG_DEF_NODES_DB_FILE "/var/lib/pica-node/nodelist.db" #define PICA_NODECONFIG_DEF_CONFIG_FILE "/etc/pica-node.conf" -#define PICA_NODECONFIG_DEF_CA_CERT_FILE "/usr/share/pica-node/CA.pem" +#define PICA_NODECONFIG_DEF_CA_CERT_FILE PICA_PREFIX"/share/pica-node/CA.pem" struct nodeconfig { -- cgit v1.2.1