Continue to install the headers in $prefix/include/speex
authorRon <ron@debian.org>
Fri, 27 Jun 2014 07:07:18 +0000 (16:37 +0930)
committerRon <ron@debian.org>
Fri, 27 Jun 2014 07:07:18 +0000 (16:37 +0930)
The $pkgincludedir for this package is now $includedir/speexdsp, which
isn't where established users are looking for these headers. Thanks to
the vlc folks for noticing this.

include/speex/Makefile.am

index c462a05..ebddaa8 100644 (file)
@@ -1,7 +1,16 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-nodist_pkginclude_HEADERS = speexdsp_config_types.h
+# Historically, these headers were part of the speex package, so in order to
+# keep compatibility with existing software we need to keep installing them
+# in the same place as they were found then.  If new functionality, with new
+# headers, are added later, some thought should be given as to whether they
+# should instead go somewhere other than $prefix/include/speex.
 
-pkginclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \
+speexincludedir = $(includedir)/speex
+
+nodist_speexinclude_HEADERS = speexdsp_config_types.h
+
+speexinclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \
        speexdsp_types.h
+