|
 |
aa1070 |
diff -up aspell-0.60.6.1/configure.fc aspell-0.60.6.1/configure
|
|
|
aa1070 |
--- aspell-0.60.6.1/configure.fc 2011-07-04 10:58:50.000000000 +0200
|
|
|
aa1070 |
+++ aspell-0.60.6.1/configure 2011-08-16 11:28:58.626771599 +0200
|
|
|
aa1070 |
@@ -839,6 +839,7 @@ MAINTAINER_MODE_FALSE
|
|
|
aa1070 |
MAINT
|
|
|
aa1070 |
pkgdocdir
|
|
|
aa1070 |
pkgdatadir
|
|
|
aa1070 |
+pkgdatadir2
|
|
|
aa1070 |
pkglibdir
|
|
|
aa1070 |
CXX
|
|
|
aa1070 |
CXXFLAGS
|
|
|
aa1070 |
@@ -2634,18 +2635,21 @@ pkgdatadir=undef
|
|
|
aa1070 |
# Check whether --enable-pkgdatadir was given.
|
|
|
aa1070 |
if test "${enable_pkgdatadir+set}" = set; then
|
|
|
aa1070 |
enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir
|
|
|
aa1070 |
+ pkgdatadir2=$enable_pkgdatadir
|
|
|
aa1070 |
fi
|
|
|
aa1070 |
|
|
|
aa1070 |
|
|
|
aa1070 |
# Check whether --enable-pkgdata-dir was given.
|
|
|
aa1070 |
if test "${enable_pkgdata_dir+set}" = set; then
|
|
|
aa1070 |
enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir
|
|
|
aa1070 |
+ pkgdatadir2=$enable_dict_dir
|
|
|
aa1070 |
fi
|
|
|
aa1070 |
|
|
|
aa1070 |
|
|
|
aa1070 |
if test "$pkgdatadir" = "undef"
|
|
|
aa1070 |
then
|
|
|
aa1070 |
pkgdatadir=\${libdir}/aspell-0.60
|
|
|
aa1070 |
+ pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
|
|
|
aa1070 |
fi
|
|
|
aa1070 |
|
|
|
aa1070 |
|
|
|
aa1070 |
@@ -20119,6 +20123,7 @@ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_F
|
|
|
aa1070 |
MAINT!$MAINT$ac_delim
|
|
|
aa1070 |
pkgdocdir!$pkgdocdir$ac_delim
|
|
|
aa1070 |
pkgdatadir!$pkgdatadir$ac_delim
|
|
|
aa1070 |
+pkgdatadir2!$pkgdatadir2$ac_delim
|
|
|
aa1070 |
pkglibdir!$pkglibdir$ac_delim
|
|
|
aa1070 |
CXX!$CXX$ac_delim
|
|
|
aa1070 |
CXXFLAGS!$CXXFLAGS$ac_delim
|
|
|
aa1070 |
@@ -20142,7 +20147,7 @@ ac_ct_CC!$ac_ct_CC$ac_delim
|
|
|
aa1070 |
CCDEPMODE!$CCDEPMODE$ac_delim
|
|
|
aa1070 |
_ACEOF
|
|
|
aa1070 |
|
|
|
aa1070 |
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
|
|
aa1070 |
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
|
|
|
aa1070 |
break
|
|
|
aa1070 |
elif $ac_last_try; then
|
|
|
aa1070 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
|
aa1070 |
diff -up aspell-0.60.6.1/Makefile.in.fc aspell-0.60.6.1/Makefile.in
|
|
|
aa1070 |
--- aspell-0.60.6.1/Makefile.in.fc 2011-07-04 10:58:49.000000000 +0200
|
|
|
aa1070 |
+++ aspell-0.60.6.1/Makefile.in 2011-08-16 11:20:09.030887258 +0200
|
|
|
aa1070 |
@@ -344,6 +344,7 @@ distcleancheck_listfiles = find . -type
|
|
|
aa1070 |
|
|
|
aa1070 |
# These are needed due to a bug in Automake
|
|
|
aa1070 |
pkgdatadir = @pkgdatadir@
|
|
|
aa1070 |
+pkgdatadir2 = @pkgdatadir2@
|
|
|
aa1070 |
pkglibdir = @pkglibdir@
|
|
|
aa1070 |
ACLOCAL = @ACLOCAL@
|
|
|
aa1070 |
AMTAR = @AMTAR@
|
|
|
aa1070 |
@@ -1932,7 +1933,7 @@ gen/dirs.h: gen/mk-dirs_h.pl
|
|
|
aa1070 |
cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > dirs.h
|
|
|
aa1070 |
|
|
|
aa1070 |
scripts/run-with-aspell: scripts/run-with-aspell.create
|
|
|
aa1070 |
- sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
|
|
|
aa1070 |
+ sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
|
|
|
aa1070 |
chmod 755 scripts/run-with-aspell
|
|
|
aa1070 |
@PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig
|
|
|
aa1070 |
@PSPELL_COMPATIBILITY_TRUE@ sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}
|