[PATCH] BUILD: fix BSE_INSTALLPATH_INCLUDES to point to the sfidl standard includes

[timj gnu org]

From: Tim Janik <timj gnu org>

Reported-by: Stefan Westerfeld <stefan space twc de>
Signed-off-by: Tim Janik <timj gnu org>
---
 bse/Makefile.am | 2 +-
 configure.ac    | 4 +++-
 sfi/Makefile.am | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git bse/Makefile.am bse/Makefile.am
index 8205d44..2fdfd2f 100644
--- bse/Makefile.am
+++ bse/Makefile.am
@@ -136,7 +136,7 @@ EXTRA_DIST += $(strip \
 # BSE library
 #
 lib_LTLIBRARIES                      = libbse- MAJOR@.la
-libbse_ MAJOR@includedir             = $(includedir)/bse- MAJOR@/bse
+libbse_ MAJOR@includedir             = $(bseincludedir)/bse
 libbse_ MAJOR@include_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl 
$(idl_dummy_files)
 nodist_libbse_ MAJOR@include_HEADERS = bsebasics.genidl.hh
 libbse_ MAJOR@_la_SOURCES            = $(bse_sources) $(bse_proc_gen_sources)
diff --git configure.ac configure.ac
index ee6fa50..45bef6a 100644
--- configure.ac
+++ configure.ac
@@ -73,10 +73,12 @@ LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
 AC_SUBST(LT_VERSION_INFO)
 
 # Define package directories per major/minor version
+bseincludedir="\${includedir}/bse-$MAJOR"
 bselibdir="\${libdir}/bse-$MAJOR.$MINOR.$MICRO"
 datadir="\${datarootdir}/beast"
 docdir="${datarootdir}/doc/beast" # "beast-$MAJOR"
 # Substitute directories in Makefiles
+AC_SUBST(bseincludedir)
 AC_SUBST(bselibdir)
 AC_SUBST(datadir)
 AC_SUBST(docdir)
@@ -84,7 +86,7 @@ AC_SUBST(docdir)
 bak_prefix="$prefix" ; bak_exec_prefix="$exec_prefix" ; bak_libdir="$libdir" ; 
bak_datarootdir="$datarootdir" ; bak_datadir="$datadir"
 test "x$prefix" = xNONE && prefix="$ac_default_prefix" ; test "x$exec_prefix" = xNONE && 
exec_prefix="$prefix"
 libdir=`eval echo "${libdir}"` ; datarootdir=`eval echo "${datarootdir}"` ; datadir=`eval echo "${datadir}"`
-AC_DEFINE_UNQUOTED(INSTALLPATH_INCLUDES, ["`eval echo "${includedir}"`"], [Base directory for standard 
include files])
+AC_DEFINE_UNQUOTED(INSTALLPATH_INCLUDES, ["`eval echo "${bseincludedir}"`"], [Sfidl standard include 
directory])
 AC_DEFINE_UNQUOTED(INSTALLPATH_BINDIR, ["`eval echo "${bindir}"`"], [Directory to install and execute 
programs])
 AC_DEFINE_UNQUOTED(INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"], [Base directory for locale specific 
message catalogs])
 AC_DEFINE_UNQUOTED(INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA plugins])
diff --git sfi/Makefile.am sfi/Makefile.am
index fa2201f..6df570f 100644
--- sfi/Makefile.am
+++ sfi/Makefile.am
@@ -35,7 +35,7 @@ $(sfi_all_sources): $(sfi_built_sources)
 
 # SFI library
 noinst_LTLIBRARIES            = libsfi- MAJOR@.la
-libsfi_ MAJOR@includedir      = $(includedir)/bse- MAJOR@/sfi
+libsfi_ MAJOR@includedir      = $(bseincludedir)/sfi
 libsfi_ MAJOR@include_HEADERS = $(sfi_public_headers)
 libsfi_ MAJOR@_la_SOURCES     = $(sfi_all_sources)
 libsfi_ MAJOR@_la_LIBADD      = $(SFI_LIBS) -lm
-- 
2.1.4