GNOME.org
 

[beast: 21/41] BUILD: preserve $libdir while moving libbse into the Beast <package> dir

commit 056684e9d6c1eb34674bdd500617f3a52d8e9c90
Author: Tim Janik <timj gnu org>
Date:   Wed Jun 14 13:23:27 2017 +0200

    BUILD: preserve $libdir while moving libbse into the Beast <package> dir
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am              |    6 +++---
 bse/Makefile.am          |    4 ++--
 configure.ac             |   13 +++++--------
 data/Makefile.am         |    2 +-
 data/bse.pc.in           |    8 ++++----
 ebeast/v8bse/Makefile.am |    2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3924a74..d1a3248 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,11 +44,11 @@ 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="$(syslibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --cflags bse` \
+       $(Q) $(CXX) -Werror tmpx.cc -c 
`PKG_CONFIG_PATH="$(bselibdir)/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="$(syslibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --libs bse` \
+       $(Q) $(CXX) -Werror tmpx.o -o tmpx 
`PKG_CONFIG_PATH="$(bselibdir)/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 \
+       $(Q) LD_LIBRARY_PATH="$(bselibdir):$$LD_LIBRARY_PATH" ./tmpx \
                ; X=$$? ; echo -n "Execute BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL; 
exit $$X ; }
        $(Q) rm -f tmpx.o tmpx.cc tmpx
 installcheck-local: bse-app-test
diff --git a/bse/Makefile.am b/bse/Makefile.am
index bb172ae..c648082 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -139,7 +139,7 @@ doc_sources.lst: Makefile
 #
 # BSE library
 #
-lib_LTLIBRARIES                      = libbse-@MAJOR@.la
+bselib_LTLIBRARIES                   = libbse-@MAJOR@.la
 libbse_@MAJOR@includedir             = $(bseincludedir)/bse
 libbse_@MAJOR@include_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) $(idl_dummy_files)
 nodist_libbse_@MAJOR@include_HEADERS = bsebasics.genidl.hh bseserverapi.hh bsehack.idl bseclientapi.hh 
bsegentypes.h
@@ -164,7 +164,7 @@ SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_builddir) -I$(top_srcdir) -I$(srcdir)
 
 install-exec-ldconfig: # libtool >= 1.5.2 doesn't always set rpath, requiring ldconfig
-       test ! -x /sbin/ldconfig -o ! -w /etc/ld.so.cache || /sbin/ldconfig $(DESTDIR)$(libdir)
+       test ! -x /sbin/ldconfig -o ! -w /etc/ld.so.cache || /sbin/ldconfig $(DESTDIR)$(bselibdir)
 install-exec-hook: install-exec-ldconfig
 
 #
diff --git a/configure.ac b/configure.ac
index 31e9f2d..9ef27e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,10 +80,8 @@ 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"
-libdir="\${beastdir}/lib"
 bselibdir="\${beastdir}/lib"
 datarootdir="\${beastdir}/share"
 datadir="\${beastdir}"
@@ -93,24 +91,24 @@ bseincludedir="\${beastdir}/include"
 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="$syslibdir/beast-$MAJOR-$MINOR" ;;
+  /usr|/usr/local)     beastdir="$libdir/beast-$MAJOR-$MINOR" ;;
   *)                   beastdir="\${exec_prefix}/beast-$MAJOR-$MINOR" ;;
 esac
-bak_libdir="$libdir"; bak_syslibdir="$syslibdir"; bak_datarootdir="$datarootdir"; bak_datadir="$datadir"
+bak_libdir="$libdir"; bak_datarootdir="$datarootdir"; bak_datadir="$datadir"
 bak_bseincludedir="$bseincludedir"; bak_beastdir="$beastdir"
-libdir=`eval echo "${libdir}"`; syslibdir=`eval echo "${syslibdir}"`; datarootdir=`eval echo 
"${datarootdir}"`; datadir=`eval echo "${datadir}"`
+libdir=`eval echo "${libdir}"`; 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 ${syslibdir}/ladspa`"], [Searchpath for LADSPA 
plugins])
+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_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"; syslibdir="$bak_syslibdir"; datarootdir="$bak_datarootdir"; datadir="$bak_datadir"
+libdir="$bak_libdir"; datarootdir="$bak_datarootdir"; datadir="$bak_datadir"
 prefix="$bak_prefix"; exec_prefix="$bak_exec_prefix"
 # Substitute directories in Makefiles
 AC_SUBST(bseincludedir)
@@ -118,7 +116,6 @@ AC_SUBST(bselibdir)
 AC_SUBST(datadir)
 AC_SUBST(docdir)
 AC_SUBST(beastdir)
-AC_SUBST(syslibdir)
 
 # == Check for git ==
 AC_MSG_CHECKING([for git repository])
diff --git a/data/Makefile.am b/data/Makefile.am
index 658946f..979215f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,7 +33,7 @@ CLEANFILES += $(noinst_build_sources)
 
 
 # install pkg-config files
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(bselibdir)/pkgconfig
 pkgconfig_DATA = bse.pc # bse-@MAJOR@.pc
 bse.pc: bse.pc.in $(top_builddir)/config.status
        $(AM_V_GEN)
diff --git a/data/bse.pc.in b/data/bse.pc.in
index 7e9c42d..c7495ec 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 beastdir=@beastdir@
-libdir=@libdir@
+bselibdir=@bselibdir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 bseincludedir=@bseincludedir@
@@ -10,8 +10,8 @@ sfidl=@exec_prefix@/sfidl
 demodir=@datadir@/demo
 sampledir=@datadir@/samples
 scriptdir=@datadir@/scripts
-plugindir=@bselibdir@/plugins
-driverdir=@bselibdir@/drivers
+plugindir=${bselibdir}plugins
+driverdir=${bselibdir}/drivers
 effectdir=@datadir@/effects
 instrumentdir=@datadir@/instruments
 
@@ -19,5 +19,5 @@ Name: Beast & Bse
 Description: Beast & Bse are an audio tracker and audio synthesis engine.
 Requires: @BSE_PC_REQUIRE@ gobject-2.0 gmodule-2.0 rapicorn
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lbse-@MAJOR@ @BSE_PC_LIBS@
+Libs: -L${bselibdir} -lbse-@MAJOR@ @BSE_PC_LIBS@
 Cflags: -I${bseincludedir} @BSE_PC_CFLAGS@
diff --git a/ebeast/v8bse/Makefile.am b/ebeast/v8bse/Makefile.am
index 9f8be99..b7c6a71 100644
--- a/ebeast/v8bse/Makefile.am
+++ b/ebeast/v8bse/Makefile.am
@@ -58,7 +58,7 @@ binding.gyp: Makefile # binding.gyp needs Makefile variables
        @echo "      'cflags_cc!':   [ $(patsubst %, '%'$(cma), $(v8bse_rmflags)) ],"   >>$@
        @echo "      'include_dirs': [ $(patsubst %, '%'$(cma), $(v8bse_incdirs)) ],"   >>$@
        @echo "      'libraries':    [ $(patsubst %, '%'$(cma), $(v8bse_libs))"         >>$@
-       @echo "                        '-Wl,-rpath,$(libdir)' ],"                       >>$@
+       @echo "                        '-Wl,-rpath,$(bselibdir)' ],"                    >>$@
        @echo "    }"                                                                   >>$@
        @echo "  ]"                                                                     >>$@
        @echo "}"                                                                       >>$@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]