diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 956f30d..fe5c319 100644 --- 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 72b3310..e6298d1 100644 --- 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 @@ -543,6 +548,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) |