[beast: 27/41] BUILD: preserve $datarootdir while installing files in Beast <package> /share
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 27/41] BUILD: preserve $datarootdir while installing files in Beast <package> /share
- Date: Fri, 16 Jun 2017 10:25:04 +0000 (UTC)
commit 58b17034a0373020c295ad1ed0161f53db977757
Author: Tim Janik <timj gnu org>
Date: Wed Jun 14 17:15:19 2017 +0200
BUILD: preserve $datarootdir while installing files in Beast <package> /share
Signed-off-by: Tim Janik <timj gnu org>
configure.ac | 9 +++++----
data/Makefile.am | 10 +++++-----
docs/Makefile.am | 11 +++++++----
3 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 581c8e7..c843cdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ test "$TEST_SRCDIR" == "$TEST_BUILDDIR" || {
beastlocaledir="\${beastdir}/locale"
beastbindir="\${beastdir}/bin"
bselibdir="\${beastdir}/lib"
-datarootdir="\${beastdir}/share"
+beastsharedir="\${beastdir}/share"
beastdatadir="\${beastdir}"
beastdocdir="\${beastdir}/doc"
bseincludedir="\${beastdir}/include"
@@ -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_libdir="$libdir"
bak_bseincludedir="$bseincludedir"; bak_beastdir="$beastdir"
-libdir=`eval echo "${libdir}"`; datarootdir=`eval echo "${datarootdir}"`
+libdir=`eval echo "${libdir}"`
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])
@@ -108,13 +108,14 @@ AC_DEFINE_UNQUOTED(CONFIGURE_INSTALLPATH_DATADIR, ["`eval echo ${beastdatadir}`"
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"
+libdir="$bak_libdir"
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(beastsharedir)
AC_SUBST(beastdatadir)
AC_SUBST(beastdocdir)
AC_SUBST(beastdir)
diff --git a/data/Makefile.am b/data/Makefile.am
index 2cad508..1e289f4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -42,7 +42,7 @@ EXTRA_DIST += bse.pc.in
CLEANFILES += bse.pc
# install related pixmaps
-sharedpixmapsdir = $(datarootdir)/pixmaps
+sharedpixmapsdir = $(beastsharedir)/pixmaps
sharedpixmaps_DATA = beast.png beast-audio-x-bse.png
beast-audio-x-bse.png: $(srcdir)/bse-mime.png
cp $< $@
@@ -61,7 +61,7 @@ $(INTLMERGE_CACHE): $(PODEPS)
LC_ALL=C $(INTLMERGE) -k -u -c $(INTLMERGE_CACHE) $(top_srcdir)/po $< $@
# generate and install .desktop file, see:
https://help.gnome.org/admin/system-admin-guide/stable/mime-types-custom.html
-dotdesktopdir = $(datarootdir)/applications
+dotdesktopdir = $(beastsharedir)/applications
dotdesktop_in_files = beast.desktop.in
dotdesktop_DATA = $(dotdesktop_in_files:.desktop.in=.desktop)
beast.desktop: beast.desktop.in
@@ -72,7 +72,7 @@ EXTRA_DIST += $(dotdesktop_in_files)
# simple overview: https://help.gnome.org/admin/system-admin-guide/stable/mime-types-custom.html
# gvfs-info testfile.bse # yields: standard::content-type: audio/x-bse
# gvfs-mime --query audio/x-bse # yields: Registered applications: beast.desktop
-sharedmimedir = $(datarootdir)/mime
+sharedmimedir = $(beastsharedir)/mime
sharedmimepackagedir = $(sharedmimedir)/packages
sharedmimepackage_in_files = beast.xml.in
sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
@@ -81,7 +81,7 @@ beast.xml: beast.xml.in
EXTRA_DIST += $(sharedmimepackage_in_files)
# ANCIENT: generate and install .mime and .keys files, from shared-mime-info-spec-0.11.html (2003-04-17)
-mimedir = $(datarootdir)/mime-info
+mimedir = $(beastsharedir)/mime-info
mime_in_file = bse.keys.in bse.mime
mime_DATA = $(mime_in_file:.keys.in=.keys)
CLEANFILES += bse.keys
@@ -89,7 +89,7 @@ bse.keys: bse.keys.in
EXTRA_DIST += $(mime_in_file)
# ANCIENT: install .applications files, from "GNOME 2.4 Desktop System Administration Guide"
-dotapplicationsdir = $(datarootdir)/application-registry
+dotapplicationsdir = $(beastsharedir)/application-registry
dotapplications_DATA = beast.applications
EXTRA_DIST += $(dotapplications_DATA)
# mime_types=...,audio/mp3,audio/x-mp3,audio/mpg3,audio/x-mpg3,audio/mpeg3,audio/x-mpeg3
diff --git a/docs/Makefile.am b/docs/Makefile.am
index ca873ce..413dda1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,10 +4,13 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = images
MOSTLYCLEANFILES =
-man1_MANS =
-man1_HTMLS =
-man5_MANS =
-man5_HTMLS =
+beastmandir = ${beastsharedir}/man
+man1dir = $(beastmandir)/man1
+man1_MANS =
+man1_HTMLS =
+man5dir = $(beastmandir)/man5
+man5_MANS =
+man5_HTMLS =
topdir = $(abs_top_srcdir)
V_gen = @printf ' %-9s%s\n'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]