[beast: 22/41] BUILD: preserve $bindir while installing executables in the Beast <package> dir

[Tim Janik <timj src gnome org>]

commit f8f603a8ac81d09768d27c9937228e981c4c9523
Author: Tim Janik <timj gnu org>
Date:   Wed Jun 14 15:53:11 2017 +0200

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

 beast-gtk/Makefile.am |    2 +-
 configure.ac          |    6 +++---
 launchers/Makefile.am |   14 +++++++-------
 sfi/Makefile.am       |    2 +-
 shell/Makefile.am     |   10 +++++-----
 tools/Makefile.am     |    2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index 1df7b36..4fe8495 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -145,7 +145,7 @@ generated: clean-generated $(GENERATED)
 #
 # build rules for programs
 #
-bin_PROGRAMS = beast-@MAJOR@.@MINOR@.@MICRO@
+beastbin_PROGRAMS = beast-@MAJOR@.@MINOR@.@MICRO@
 beast_@MAJOR@_@MINOR@_@MICRO@_SOURCES = $(bst_cc_sources) bstmain.cc
 nodist_beast_@MAJOR@_@MINOR@_@MICRO@_SOURCES = ../topbuildid.cc
 beast_@MAJOR@_@MINOR@_@MICRO@_LDADD = $(progs_LDADD)
diff --git a/configure.ac b/configure.ac
index 9ef27e9..eec4277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ test "$TEST_SRCDIR" == "$TEST_BUILDDIR" || {
 
 # Define package directories per major/minor version
 localedir="\${beastdir}/locale"
-bindir="\${beastdir}/bin"
+beastbindir="\${beastdir}/bin"
 bselibdir="\${beastdir}/lib"
 datarootdir="\${beastdir}/share"
 datadir="\${beastdir}"
@@ -100,7 +100,7 @@ libdir=`eval echo "${libdir}"`; datarootdir=`eval echo "${datarootdir}"`; datadi
 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_BINDIR, ["`eval echo "${beastbindir}"`"], [Directory to install and 
execute Beast])
 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_BSELIBDIR, ["`eval echo ${bselibdir}`"], [Directory to install 
plugins and drivers])
@@ -112,8 +112,8 @@ libdir="$bak_libdir"; datarootdir="$bak_datarootdir"; datadir="$bak_datadir"
 prefix="$bak_prefix"; exec_prefix="$bak_exec_prefix"
 # Substitute directories in Makefiles
 AC_SUBST(bseincludedir)
+AC_SUBST(beastbindir)
 AC_SUBST(bselibdir)
-AC_SUBST(datadir)
 AC_SUBST(docdir)
 AC_SUBST(beastdir)
 
diff --git a/launchers/Makefile.am b/launchers/Makefile.am
index 03535de..027d67b 100644
--- a/launchers/Makefile.am
+++ b/launchers/Makefile.am
@@ -2,21 +2,21 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I.
-DEFS        += @DEFINE__FILE_DIR__@ -DBINDIR=\"$(bindir)\"
+DEFS        += @DEFINE__FILE_DIR__@ -DBINDIR=\"$(beastbindir)\"
 AM_CXXFLAGS += $(LAUNCHER_CFLAGS) -DG_DISABLE_CONST_RETURNS
 
 #
 # programs to build
 #
-bin_PROGRAMS   = beast
-beast_SOURCES  = suidmain.c beaststart.c
-EXTRA_DIST    += suidmain.h
+beastbin_PROGRAMS = beast
+beast_SOURCES        = suidmain.c beaststart.c
+EXTRA_DIST          += suidmain.h
 
 #
 # make beast wrapper suid to allow renicing
 #
 install-exec-hook:     # runs after install-binPROGRAMS
        true \
-       && ( chown root $(DESTDIR)$(bindir)/beast   \
-       &&   chmod 4755 $(DESTDIR)$(bindir)/beast ) \
-       || ( echo "*** WARNING *** $(DESTDIR)$(bindir)/beast needs to be installed as root to allow renicing 
***" && sleep 5 )
+       && ( chown root $(DESTDIR)$(beastbindir)/beast   \
+       &&   chmod 4755 $(DESTDIR)$(beastbindir)/beast ) \
+       || ( echo "*** WARNING *** $(DESTDIR)$(beastbindir)/beast needs to be installed as root to allow 
renicing ***" && sleep 5 )
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index b51d2c7..de48226 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -52,7 +52,7 @@ libsfi_@MAJOR@_la_LIBADD      = $(LIBBSE_LIBS)
 #
 # source files
 
-bin_PROGRAMS   = sfidl
+beastbin_PROGRAMS = sfidl
 sfidl_SOURCES  = sfidl.cc
 sfidl_CXXFLAGS = $(AM_CXXFLAGS) $(LIBBSE_CFLAGS) -DBSE_CONVENIENCE
 sfidl_LDADD    = $(LIBBSE_LIBS)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0149adf..75c4510 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -21,9 +21,9 @@ programs_ldadd = ../bse/libbse-@MAJOR@.la $(LIBBSE_LIBS)
 #
 # programs to build
 #
-bin_PROGRAMS = bsescm
-bsescm_SOURCES = bsescm.cc bsescminterp.cc
-bsescm_LDADD = $(programs_ldadd) $(BSESCM_LIBS)
+beastbin_PROGRAMS = bsescm
+bsescm_SOURCES    = bsescm.cc bsescminterp.cc
+bsescm_LDADD      = $(programs_ldadd) $(BSESCM_LIBS)
 
 # source setups
 bsescminterp.cc: # bsescm-genglue.c
@@ -48,8 +48,8 @@ EXTRA_DIST += $(shellscript_DATA)
 installcheck-local: check-binary
 .PHONY: check-binary
 check-binary:
-       @for p in $(bin_PROGRAMS) ; do                                  \
-         pp="$(DESTDIR)$(bindir)/$$p" ;                                \
+       @for p in $(beastbin_PROGRAMS) ; do                             \
+         pp="$(DESTDIR)$(beastbindir)/$$p" ;                           \
          echo "TEST: test -x \"$$pp\"" ;                               \
          test -x "$$pp" ||                                             \
            { echo "Failed to verify installation of executable: $$pp"; \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 84c22c9..1288a2e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,7 +21,7 @@ doc_sources.lst: Makefile
 # tools to build
 #
 
-bin_PROGRAMS        = bsewavetool
+beastbin_PROGRAMS   = bsewavetool
 bsewavetool_SOURCES = bsewavetool.cc bwtwave.cc bseloopfuncs.cc
 nodist_bsewavetool_SOURCES = ../topbuildid.cc
 bsewavetool_LDADD   = $(progs_ldadd)