[beast: 26/41] BUILD: preserve $datadir while installing data files in the Beast <package> dir

[Tim Janik <timj src gnome org>]

commit 664f0b9af446cd929c138d87375c903dbbf6a946
Author: Tim Janik <timj gnu org>
Date:   Wed Jun 14 17:08:56 2017 +0200

    BUILD: preserve $datadir while installing data files in the Beast <package> dir
    
    Signed-off-by: Tim Janik <timj gnu org>

 configure.ac                     |   11 ++++++-----
 data/Makefile.am                 |    2 +-
 docs/images/Makefile.am          |    2 +-
 library/demo/Makefile.am         |    2 +-
 library/effects/Makefile.am      |    2 +-
 library/instruments/Makefile.am  |    2 +-
 library/keys/Makefile.am         |    2 +-
 library/samples/Makefile.am      |    2 +-
 library/scripts/Makefile.am      |    2 +-
 library/skins/Makefile.am        |    2 +-
 library/skins/images/Makefile.am |    2 +-
 shell/Makefile.am                |    2 +-
 12 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0a8ed1b..581c8e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ beastlocaledir="\${beastdir}/locale"
 beastbindir="\${beastdir}/bin"
 bselibdir="\${beastdir}/lib"
 datarootdir="\${beastdir}/share"
-datadir="\${beastdir}"
+beastdatadir="\${beastdir}"
 beastdocdir="\${beastdir}/doc"
 bseincludedir="\${beastdir}/include"
 # Provide directories for C++ and move Beast packagedir into libdir if under /usr
@@ -94,9 +94,9 @@ case `eval echo "${exec_prefix}"` in
   /usr|/usr/local)     beastdir="$libdir/beast-$MAJOR-$MINOR" ;;
   *)                   beastdir="\${exec_prefix}/beast-$MAJOR-$MINOR" ;;
 esac
-bak_libdir="$libdir"; bak_datarootdir="$datarootdir"; bak_datadir="$datadir"
+bak_libdir="$libdir"; bak_datarootdir="$datarootdir"
 bak_bseincludedir="$bseincludedir"; bak_beastdir="$beastdir"
-libdir=`eval echo "${libdir}"`; datarootdir=`eval echo "${datarootdir}"`; datadir=`eval echo "${datadir}"`
+libdir=`eval echo "${libdir}"`; datarootdir=`eval echo "${datarootdir}"`
 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])
@@ -104,17 +104,18 @@ AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_BINDIR, ["`eval echo "${beastbindir}"`"
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_LOCALEBASE, ["`eval echo ${beastlocaledir}`"], [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_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_DATADIR, ["`eval echo ${beastdatadir}`"], [Directory to install 
samples, effects, scripts, etc])
 AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DOCDIR, ["`eval echo ${beastdocdir}`"], [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"; datarootdir="$bak_datarootdir"
 prefix="$bak_prefix"; exec_prefix="$bak_exec_prefix"
 # Substitute directories in Makefiles
 AC_SUBST(beastlocaledir)
 AC_SUBST(bseincludedir)
 AC_SUBST(beastbindir)
 AC_SUBST(bselibdir)
+AC_SUBST(beastdatadir)
 AC_SUBST(beastdocdir)
 AC_SUBST(beastdir)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 979215f..2cad508 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ public_images = $(strip         \
        beast-splash.png        \
 )
 images_DATA = ${public_images}
-imagesdir = $(datadir)/images
+imagesdir = $(beastdatadir)/images
 EXTRA_DIST += $(private_images) $(public_images)
 
 # generate image header files
diff --git a/docs/images/Makefile.am b/docs/images/Makefile.am
index ce8289d..5ac2dcb 100644
--- a/docs/images/Makefile.am
+++ b/docs/images/Makefile.am
@@ -7,5 +7,5 @@ SVG_FILES = beast-components.svg  beast-progs.svg  module-voices.svg
 
 # PNG_FILES = beast-components.png  beast-progs.png  module-voices.png
 # docimages_DATA = $(PNG_FILES)
-# docimagesdir = $(datadir)/images
+# docimagesdir = $(beastdatadir)/images
 # EXTRA_DIST += $(PNG_FILES)
diff --git a/library/demo/Makefile.am b/library/demo/Makefile.am
index 4111c68..30beb6a 100644
--- a/library/demo/Makefile.am
+++ b/library/demo/Makefile.am
@@ -7,6 +7,6 @@ demo_DATA = $(strip             \
        stereo-through.bse      \
        x2-midi-test.bse        \
 )
-demodir = $(datadir)/demo
+demodir = $(beastdatadir)/demo
 
 EXTRA_DIST += $(demo_DATA)
diff --git a/library/effects/Makefile.am b/library/effects/Makefile.am
index 287c28e..9d0ef5a 100644
--- a/library/effects/Makefile.am
+++ b/library/effects/Makefile.am
@@ -8,6 +8,6 @@ effects_DATA = $(strip                  \
        bqs-reverb.bse                  \
        bqs-saturation-and-reverb.bse   \
 )
-effectsdir = $(datadir)/effects
+effectsdir = $(beastdatadir)/effects
 
 EXTRA_DIST += $(effects_DATA)
diff --git a/library/instruments/Makefile.am b/library/instruments/Makefile.am
index 8ca8c98..9ea0d28 100644
--- a/library/instruments/Makefile.am
+++ b/library/instruments/Makefile.am
@@ -10,6 +10,6 @@ instruments_DATA = $(strip    \
        illus-vtremolo.bse              \
        stw-iron-string.bse             \
 )
-instrumentsdir = $(datadir)/instruments
+instrumentsdir = $(beastdatadir)/instruments
 
 EXTRA_DIST += $(instruments_DATA)
diff --git a/library/keys/Makefile.am b/library/keys/Makefile.am
index 8f721b5..34b820a 100644
--- a/library/keys/Makefile.am
+++ b/library/keys/Makefile.am
@@ -5,6 +5,6 @@ keys_DATA = $(strip             \
        keyrc.de                \
        keyrc.us                \
 )
-keysdir = $(datadir)/keys
+keysdir = $(beastdatadir)/keys
 
 EXTRA_DIST += $(keys_DATA)
diff --git a/library/samples/Makefile.am b/library/samples/Makefile.am
index 2615d94..8fb37c6 100644
--- a/library/samples/Makefile.am
+++ b/library/samples/Makefile.am
@@ -5,6 +5,6 @@ include $(top_srcdir)/Makefile.decl
 sample_DATA = $(strip                  \
        retrokit.bsewave                \
 )
-sampledir = $(datadir)/samples
+sampledir = $(beastdatadir)/samples
 
 EXTRA_DIST += $(sample_DATA)
diff --git a/library/scripts/Makefile.am b/library/scripts/Makefile.am
index 2c577cf..f4056bf 100644
--- a/library/scripts/Makefile.am
+++ b/library/scripts/Makefile.am
@@ -10,6 +10,6 @@ scripts_DATA = $(strip                        \
        part-harmonic-transposer.scm    \
        mixer-splitup-by-track.scm      \
 )
-scriptsdir = $(datadir)/scripts
+scriptsdir = $(beastdatadir)/scripts
 
 EXTRA_DIST += $(scripts_DATA)
diff --git a/library/skins/Makefile.am b/library/skins/Makefile.am
index fecdff9..7a0c4ee 100644
--- a/library/skins/Makefile.am
+++ b/library/skins/Makefile.am
@@ -11,6 +11,6 @@ skins_DATA = $(strip          \
        silvervein.skin         \
        white.skin              \
 )
-skinsdir = $(datadir)/skins
+skinsdir = $(beastdatadir)/skins
 
 EXTRA_DIST += $(skins_DATA)
diff --git a/library/skins/images/Makefile.am b/library/skins/images/Makefile.am
index d58b572..cf8d166 100644
--- a/library/skins/images/Makefile.am
+++ b/library/skins/images/Makefile.am
@@ -9,6 +9,6 @@ images_DATA = $(strip           \
        moonpaper.png           \
        silvervein.png          \
 )
-imagesdir = $(datadir)/skins/images
+imagesdir = $(beastdatadir)/skins/images
 
 EXTRA_DIST += $(images_DATA)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 75c4510..74a5ff4 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST += bsescminterp.hh
 #
 # scripts
 #
-shellscriptdir = $(datadir)/scripts
+shellscriptdir = $(beastdatadir)/scripts
 shellscript_DATA = bse-scm-glue.boot
 
 EXTRA_DIST += $(shellscript_DATA)