diff options
| author | Sebastian Geerken (patch by Johannes Hofmann) <devnull@localhost> | 2012-09-13 09:44:09 +0200 |
|---|---|---|
| committer | Sebastian Geerken (patch by Johannes Hofmann) <devnull@localhost> | 2012-09-13 09:44:09 +0200 |
| commit | cb4003e1cac5abfbc7b02cb57d4663d976ef8550 (patch) | |
| tree | fc6bdf9a0c195ee41751abc828015f495c68da88 | |
| parent | eb64db506bb05ac4c1e357341140aa0091846009 (diff) | |
Correction of last patch.
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | dw/Makefile.am | 2 | ||||
| -rw-r--r-- | dw/hyphenator.cc | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index d2ccc243..5b7cf273 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,6 @@ AC_CONFIG_SRCDIR([src/dillo.cc]) AC_CONFIG_HEADERS([config.h]) sysconfdir=${sysconfdir}/${PACKAGE} -libdir=${libdir}/${PACKAGE} dnl Options diff --git a/dw/Makefile.am b/dw/Makefile.am index cd9fbd11..07948b5f 100644 --- a/dw/Makefile.am +++ b/dw/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ - -DDILLO_LIB='"$(libdir)/"' + -DDILLO_LIBDIR='"$(pkglibdir)/"' noinst_LIBRARIES = \ diff --git a/dw/hyphenator.cc b/dw/hyphenator.cc index 6b9e1c7e..0fbdb699 100644 --- a/dw/hyphenator.cc +++ b/dw/hyphenator.cc @@ -90,11 +90,12 @@ Hyphenator *Hyphenator::getHyphenator (core::Platform *platform, if (hyphenator) delete pair; else { - // TODO Much hard-coded! char patFile [PATH_MAX]; - snprintf (patFile, sizeof (patFile), "%s/hyphenation/%s.pat", DILLO_LIB, lang); + snprintf (patFile, sizeof (patFile), "%s/hyphenation/%s.pat", + DILLO_LIBDIR, lang); char excFile [PATH_MAX]; - snprintf (excFile, sizeof(excFile), "%s/hyphenation/%s.exc", DILLO_LIB, lang); + snprintf (excFile, sizeof(excFile), "%s/hyphenation/%s.exc", + DILLO_LIBDIR, lang); //printf ("Loading hyphenation patterns for language '%s' from '%s' and " // "exceptions from '%s' ...\n", lang, patFile, excFile); |