[beast: 4/9] BUILD: install unversioned data in ${prefix}/share/beast/



commit 67e1273198d458ed9c03937728decae6579b27f0
Author: Tim Janik <timj gnu org>
Date:   Wed Oct 28 09:18:40 2015 +0100

    BUILD: install unversioned data in ${prefix}/share/beast/
    
    Signed-off-by: Tim Janik <timj gnu org>

 configure.ac     |    2 +-
 data/Makefile.am |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f79d0a5..b1a6444 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ AC_SUBST(LT_VERSION_INFO)
 
 # Define package directories per major/minor version
 bselibdir="\${libdir}/bse-$MAJOR.$MINOR.$MICRO"
-pkgdatadir="\${datadir}/beast-$MAJOR"
+pkgdatadir="\${datarootdir}/beast"
 docdir="${datarootdir}/doc/beast" # "beast-$MAJOR"
 # Substitute directories in Makefiles
 AC_SUBST(bselibdir)
diff --git a/data/Makefile.am b/data/Makefile.am
index 55bd359..633372c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -42,12 +42,12 @@ EXTRA_DIST += bse.pc.in
 CLEANFILES += bse.pc
 
 # install .applications files
-dotapplicationsdir = $(datadir)/application-registry
+dotapplicationsdir = $(datarootdir)/application-registry
 dotapplications_DATA = beast.applications
 EXTRA_DIST += $(dotapplications_DATA)
 
 # install related pixmaps
-sharedpixmapsdir = $(datadir)/pixmaps
+sharedpixmapsdir = $(datarootdir)/pixmaps
 sharedpixmaps_DATA = beast.png beast-audio-x-bse.png
 beast-audio-x-bse.png: $(srcdir)/bse-mime.png
        cp $< $@
@@ -67,7 +67,7 @@ $(INTLMERGE_CACHE): $(PODEPS)
        LC_ALL=C $(INTLMERGE) -k -u -c $(INTLMERGE_CACHE) $(top_srcdir)/po $< $@
 
 # generate and install .desktop file
-dotdesktopdir = $(datadir)/applications
+dotdesktopdir = $(datarootdir)/applications
 dotdesktop_in_files = beast.desktop.in
 dotdesktop_DATA = $(dotdesktop_in_files:.desktop.in=.desktop)
 beast.desktop: beast.desktop.in
@@ -75,7 +75,7 @@ CLEANFILES += beast.desktop
 EXTRA_DIST += $(dotdesktop_in_files)
 
 # generate and install .xml mime info file
-sharedmimedir = $(datadir)/mime
+sharedmimedir = $(datarootdir)/mime
 sharedmimepackagedir = $(sharedmimedir)/packages
 sharedmimepackage_in_files = beast.xml.in
 sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
@@ -84,7 +84,7 @@ beast.xml: beast.xml.in
 EXTRA_DIST += $(sharedmimepackage_in_files)
 
 # generate and install .mime and .keys files
-mimedir = $(datadir)/mime-info
+mimedir = $(datarootdir)/mime-info
 mime_in_file = bse.keys.in bse.mime
 mime_DATA = $(mime_in_file:.keys.in=.keys)
 CLEANFILES += bse.keys


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]