tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] defining LIBPOSTAL_DATA_DIR in Autoconf rather than Automake, becomes part of config.h

Browse Source
This commit is contained in:
Al
2015-10-26 18:06:01 -04:00
parent 8a188903b3
commit a319c1f6a0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -57,4 +57,6 @@ AC_CHECK_PROG([FOUND_GSHUF], [gshuf], [yes])
AS_IF([test "x$FOUND_SHUF" = xyes], [AC_DEFINE([HAVE_SHUF], [1], [shuf available])]) AS_IF([test "x$FOUND_SHUF" = xyes], [AC_DEFINE([HAVE_SHUF], [1], [shuf available])])
AS_IF([test "x$FOUND_GSHUF" = xyes], [AC_DEFINE([HAVE_GSHUF], [1], [gshuf available])]) AS_IF([test "x$FOUND_GSHUF" = xyes], [AC_DEFINE([HAVE_GSHUF], [1], [gshuf available])])
AC_DEFINE_UNQUOTED([LIBPOSTAL_DATA_DIR], ["$datadir/libpostal"], [Data directory for libpostsal])
AC_OUTPUT AC_OUTPUT

4
src/Makefile.am
View File

@@ -7,7 +7,7 @@ CFLAGS_O2 = $(CFLAGS_BASE) -O2
CFLAGS_O3 = $(CFLAGS_BASE) -O3 CFLAGS_O3 = $(CFLAGS_BASE) -O3
DEFAULT_INCLUDES=-I.. DEFAULT_INCLUDES=-I..
CFLAGS = $(CFLAGS_BASE) -DLIBPOSTAL_DATA_DIR='"$(LIBPOSTAL_DATA_DIR)"' CFLAGS = $(CFLAGS_BASE)
lib_LTLIBRARIES = libpostal.la lib_LTLIBRARIES = libpostal.la
libpostal_la_SOURCES = libpostal.c address_dictionary.c transliterate.c tokens.c trie.c trie_search.c string_utils.c file_utils.c numex.c utf8proc/utf8proc.c cmp/cmp.c geodb.c geo_disambiguation.c normalize.c bloom.c features.c geonames.c geohash/geohash.c unicode_scripts.c msgpack_utils.c libpostal_la_SOURCES = libpostal.c address_dictionary.c transliterate.c tokens.c trie.c trie_search.c string_utils.c file_utils.c numex.c utf8proc/utf8proc.c cmp/cmp.c geodb.c geo_disambiguation.c normalize.c bloom.c features.c geonames.c geohash/geohash.c unicode_scripts.c msgpack_utils.c
@@ -40,8 +40,6 @@ build_trans_table_CFLAGS = $(CFLAGS_O3)
pkginclude_HEADERS = libpostal.h pkginclude_HEADERS = libpostal.h
LIBPOSTAL_DATA_DIR = $(datadir)/libpostal
all-local: all-local:
./libpostal_data download base $(LIBPOSTAL_DATA_DIR) ./libpostal_data download base $(LIBPOSTAL_DATA_DIR)