Blame SOURCES/aspell-0.60.7-fileconflict.patch

d4e30d
diff --git a/Makefile.in b/Makefile.in
d4e30d
index f293649..e5d2b1a 100644
d4e30d
--- a/Makefile.in
d4e30d
+++ b/Makefile.in
d4e30d
@@ -518,6 +518,7 @@ distcleancheck_listfiles = find . -type f -print
d4e30d
 
d4e30d
 # These are needed due to a bug in Automake
d4e30d
 pkgdatadir = @pkgdatadir@
d4e30d
+pkgdatadir2 = @pkgdatadir2@
d4e30d
 pkglibdir = @pkglibdir@
d4e30d
 ACLOCAL = @ACLOCAL@
d4e30d
 AMTAR = @AMTAR@
d4e30d
@@ -2071,7 +2072,7 @@ gen/dirs.h: gen/mk-dirs_h.pl
d4e30d
 	perl ${srcdir}/gen/mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir}  ${sysconfdir} >  gen/dirs.h
d4e30d
 
d4e30d
 scripts/run-with-aspell: scripts/run-with-aspell.create
d4e30d
-	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
d4e30d
+	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
d4e30d
 	chmod 755 scripts/run-with-aspell
d4e30d
 @PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig
d4e30d
 @PSPELL_COMPATIBILITY_TRUE@	sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}
d4e30d
diff --git a/configure b/configure
d4e30d
index 1236c90..8a6e697 100755
d4e30d
--- a/configure
d4e30d
+++ b/configure
d4e30d
@@ -709,6 +709,7 @@ CXXFLAGS
d4e30d
 CXX
d4e30d
 pkglibdir
d4e30d
 pkgdatadir
d4e30d
+pkgdatadir2
d4e30d
 pkgdocdir
d4e30d
 MAINT
d4e30d
 MAINTAINER_MODE_FALSE
d4e30d
@@ -3297,18 +3298,21 @@ pkgdatadir=undef
d4e30d
 # Check whether --enable-pkgdatadir was given.
d4e30d
 if test "${enable_pkgdatadir+set}" = set; then :
d4e30d
   enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir
d4e30d
+  pkgdatadir2=$enable_pkgdatadir
d4e30d
 fi
d4e30d
 
d4e30d
 
d4e30d
 # Check whether --enable-pkgdata-dir was given.
d4e30d
 if test "${enable_pkgdata_dir+set}" = set; then :
d4e30d
   enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir
d4e30d
+  pkgdatadir2=$enable_dict_dir
d4e30d
 fi
d4e30d
 
d4e30d
 
d4e30d
 if test "$pkgdatadir" = "undef"
d4e30d
 then
d4e30d
   pkgdatadir=\${libdir}/aspell-0.60
d4e30d
+  pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
d4e30d
 fi
d4e30d
 
d4e30d