[beast: 14/41] BUILD: move library and data files into Beast <package> dir

[Tim Janik <timj src gnome org>]

commit 98733413b44425cb25baf15cb5275db628b7aa21
Author: Tim Janik <timj gnu org>
Date:   Sun Jun 11 22:17:32 2017 +0200

    BUILD: move library and data files into Beast <package> dir
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am  |    4 ++--
 configure.ac |   18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b6002e5..3924a74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,9 +44,9 @@ bse-app-test:
        && echo '  Bse::init_async (&argc, argv, "bse-app-test");'      >> tmpx.cc \
        && echo '  return 0; }'                                         >> tmpx.cc \
                ; X=$$? ; echo -n "Create  BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
-       $(Q) $(CXX) -Werror tmpx.cc -c `PKG_CONFIG_PATH="$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config 
--cflags bse` \
+       $(Q) $(CXX) -Werror tmpx.cc -c 
`PKG_CONFIG_PATH="$(syslibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --cflags bse` \
                ; X=$$? ; echo -n "Compile BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
-       $(Q) $(CXX) -Werror tmpx.o -o tmpx `PKG_CONFIG_PATH="$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" 
pkg-config --libs bse` \
+       $(Q) $(CXX) -Werror tmpx.o -o tmpx 
`PKG_CONFIG_PATH="$(syslibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --libs bse` \
                ; X=$$? ; echo -n "Link    BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
        $(Q) LD_LIBRARY_PATH="$(libdir):$$LD_LIBRARY_PATH" ./tmpx \
                ; X=$$? ; echo -n "Execute BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
diff --git a/configure.ac b/configure.ac
index 5a6e6e6..f3ea664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,34 +80,37 @@ test "$TEST_SRCDIR" == "$TEST_BUILDDIR" || {
 }
 
 # Define package directories per major/minor version
+syslibdir="$libdir"            # since we redirect libdir, save its original value as syslibdir
 localedir="\${beastdir}/locale"
 bindir="\${beastdir}/bin"
-bseincludedir="\${beastdir}/include"
+libdir="\${beastdir}/lib"
 bselibdir="\${beastdir}/lib"
-datadir="\${beastdir}"
+datarootdir="\${beastdir}"
+datadir="\${datarootdir}"
 docdir="\${beastdir}/doc"
+bseincludedir="\${beastdir}/include"
 # Provide directories for C++ and move Beast packagedir into libdir if under /usr
 bak_prefix="$prefix"; bak_exec_prefix="$exec_prefix"
 test "x$prefix" != xNONE || prefix="$ac_default_prefix" ; test "x$exec_prefix" != xNONE || 
exec_prefix="$prefix"
 case `eval echo "${exec_prefix}"` in
-  /usr|/usr/local)     beastdir="\${libdir}/beast-$MAJOR-$MINOR" ;;
+  /usr|/usr/local)     beastdir="$syslibdir/beast-$MAJOR-$MINOR" ;;
   *)                   beastdir="\${exec_prefix}/beast-$MAJOR-$MINOR" ;;
 esac
-bak_libdir="$libdir"; bak_datarootdir="$datarootdir"; bak_datadir="$datadir"
+bak_libdir="$libdir"; bak_syslibdir="$syslibdir"; bak_datarootdir="$datarootdir"; bak_datadir="$datadir"
 bak_bseincludedir="$bseincludedir"; bak_beastdir="$beastdir"
-libdir=`eval echo "${libdir}"`; datarootdir=`eval echo "${datarootdir}"`; datadir=`eval echo "${datadir}"`
+libdir=`eval echo "${libdir}"`; syslibdir=`eval echo "${syslibdir}"`; datarootdir=`eval echo 
"${datarootdir}"`; datadir=`eval echo "${datadir}"`
 bseincludedir=`eval echo "${bseincludedir}"`; beastdir=`eval echo "${beastdir}"`
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_BEASTDIR, ["`eval echo "${beastdir}"`"], [Beast program directory])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_BSEINCLUDEDIR, ["`eval echo "${bseincludedir}"`"], [Directory for 
libbse header files])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_BINDIR, ["`eval echo "${bindir}"`"], [Directory to install and 
execute programs])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"], [Base directory for 
locale specific message catalogs])
-AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA 
plugins])
+AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_LADSPA, ["`eval echo ${syslibdir}/ladspa`"], [Searchpath for LADSPA 
plugins])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_BSELIBDIR, ["`eval echo ${bselibdir}`"], [Directory to install 
plugins and drivers])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DATADIR, ["`eval echo ${datadir}`"], [Directory to install samples, 
effects, scripts, etc])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DOCDIR, ["`eval echo ${docdir}`"], [Directory to install 
documentation])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
 bseincludedir="$bak_bseincludedir"; beastdir="$bak_beastdir"
-libdir="$bak_libdir"; datarootdir="$bak_datarootdir"; datadir="$bak_datadir"
+libdir="$bak_libdir"; syslibdir="$bak_syslibdir"; datarootdir="$bak_datarootdir"; datadir="$bak_datadir"
 prefix="$bak_prefix"; exec_prefix="$bak_exec_prefix"
 # Substitute directories in Makefiles
 AC_SUBST(bseincludedir)
@@ -115,6 +118,7 @@ AC_SUBST(bselibdir)
 AC_SUBST(datadir)
 AC_SUBST(docdir)
 AC_SUBST(beastdir)
+AC_SUBST(syslibdir)
 
 # == Check for git ==
 AC_MSG_CHECKING([for git repository])