diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2015-02-22 23:59:37 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2015-02-22 23:59:37 +0000 |
| commit | 47203ff72497263c9eec2d8ade73e76df21cc454 (patch) | |
| tree | 953b088d8d845f6d4377129b2c349c4b6d66938d | |
| parent | 161bb27acc30c71f7b08ccc3a47ad4027d259324 (diff) | |
If libjpeg-turbo is configured with a non-default prefix, such as /usr, then use the docdir variable defined by autoconf 2.60 and later, if available. This will, for instance, install the documentation under /usr/share/doc/libjpeg-turbo by default if prefix=/usr, unless docdir is overridden. When using earlier versions of autoconf, docdir is set to ${datadir}/doc, as it always has been.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1532 632fc199-4ca6-4c93-a231-07263d6284db
| -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) |