If libjpeg-turbo is configured with a non-default prefix, such as /usr, then use...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.4.x@1535 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/Makefile.am b/Makefile.am
index 956f30df40da8e7cecde2e40b153eec8cfeef833..fe5c319582501bf77b72e163ae8eb323fbe94afb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,11 +158,10 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
 DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.txt \
        ChangeLog.txt
 
-docdir = $(datadir)/doc
 dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \
        wizard.txt
 
-exampledir = $(datadir)/doc
+exampledir = $(docdir)
 dist_example_DATA = example.c
 
 

diff --git a/configure.ac b/configure.ac
index 3105e2180c94d903e1f989e4b9795f34e9f836b0..f2b8cf2e4cb8689efd49074a66f67dbacfc006ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,11 @@ DATADIR=`eval echo $DATADIR`
 if test "$DATADIR" = "/opt/libjpeg-turbo/share"; then
   datarootdir='${prefix}'
 fi
+DOCDIR=`eval echo ${docdir}`
+DOCDIR=`eval echo $DOCDIR`
+if test "$DOCDIR" = "/opt/libjpeg-turbo/doc/libjpeg-turbo"; then
+  docdir='${datadir}/doc'
+fi
 
 old_exec_prefix=${exec_prefix}
 if test "x$exec_prefix" = "xNONE"; then
@@ -538,6 +543,11 @@ case "$host_cpu" in
     ;;
 esac
 
+if test "${docdir}" = ""; then
+  docdir=${datadir}/doc
+  AC_SUBST(docdir)
+fi
+
 AC_SUBST(RPMARCH)
 AC_SUBST(RPM_CONFIG_ARGS)
 AC_SUBST(DEBARCH)