Skip to content
This repository
Browse code

Merge pull request #3 from nrh/master

do more to honor --prefix
  • Loading branch information...
commit e4f674f660c3f59815a51af5404dec3b942af1b5 2 parents 9c8ba83 + dcc100b
Erik Bourget authored November 28, 2011
2  libcrange/source/functions/Makefile.am
... ...
@@ -1,4 +1,4 @@
1  
-AM_CFLAGS = -g -pg -Wall -DLIBCRANGE_FUNCDIR=\"$(pkglibdir)\" -I../src @PCRE_CFLAGS@ @APR_CFLAGS@
  1
+AM_CFLAGS = -g -pg -Wall -DLIBCRANGE_FUNCDIR=\"$(pkglibdir)\" -DLIBCRANGE_CONF=\"$(sysconfdir)/range.conf\" -DDEFAULT_SQLITE_DB=\"$(localstatedir)/range.sqlite\" -DLIBCRANGE_YAML_DIR=\"$(sysconfdir)/range/\" -I../src @PCRE_CFLAGS@ @APR_CFLAGS@
2 2
 AM_LDFLAGS = -module -L../src -lcrange -lyaml -lsqlite3 @PCRE_LIBS@ @APR_LIBS@
3 3
 
4 4
 pkglib_LTLIBRARIES = yst-ip-list.la ip.la nodescf.la yamlfile.la sqlite.la
2  libcrange/source/functions/yamlfile.c
@@ -65,7 +65,7 @@ the key will be composed of all elements set-added together.
65 65
 #include "libcrange.h"
66 66
 #include "range.h"
67 67
 
68  
-static const char* yaml_path = "/etc/range";
  68
+static const char* yaml_path = LIBCRANGE_YAML_DIR;
69 69
 
70 70
 /* List of functions that are provided by this module */
71 71
 const char** functions_provided(libcrange* lr)
2  libcrange/source/src/Makefile.am
@@ -15,7 +15,7 @@ libcrange_la_SOURCES = range_parser.y range_scanner.l \
15 15
           libcrange.c ast.c range_compress.c \
16 16
           range.c
17 17
 
18  
-libcrange_la_CFLAGS = -Wall -DLIBCRANGE_FUNCDIR=\"$(pkglibdir)\" @PERL_CFLAGS@ @PCRE_CFLAGS@ @APR_CFLAGS@
  18
+libcrange_la_CFLAGS = -Wall -DLIBCRANGE_FUNCDIR=\"$(pkglibdir)\" -DLIBCRANGE_CONF=\"$(sysconfdir)/range.conf\" -DDEFAULT_SQLITE_DB=\"$(localstatedir)/range.sqlite\" -DLIBCRANGE_YAML_DIR=\"$(sysconfdir)/range/\" @PERL_CFLAGS@ @PCRE_CFLAGS@ @APR_CFLAGS@
19 19
 libcrange_la_LDFLAGS = @PERL_LIBS@ @PCRE_LIBS@ @APR_LIBS@
20 20
 
21 21
 range_scanner.h:
4  libcrange/source/src/libcrange.h
@@ -15,8 +15,8 @@ extern "C"
15 15
 
16 16
 #define LIBCRANGE_VERSION "1.0"
17 17
 
18  
-#define LIBCRANGE_CONF "/etc/libcrange.conf"
19  
-#define DEFAULT_SQLITE_DB "/etc/range.sqlite"
  18
+//#define LIBCRANGE_CONF "/usr/local/etc/libcrange.conf"
  19
+//#define DEFAULT_SQLITE_DB "/usr/local/var/libcrange/range.sqlite"
20 20
 //#define LIBCRANGE_FUNCDIR "/usr/lib/libcrange"
21 21
 
22 22
 struct libcrange;

0 notes on commit e4f674f

Please sign in to comment.
Something went wrong with that request. Please try again.