GNOME.org
 

[beast: 3/9] BUILD: install unversioned docs in ${prefix}/doc/beast/

commit acfe51e4f032e0760d5f8c6390b1790bad8d56ac
Author: Tim Janik <timj gnu org>
Date:   Tue Oct 27 20:54:27 2015 +0100

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

 Makefile.am          |    2 +-
 beast-gtk/bstapp.cc  |    2 +-
 beast-gtk/bstmain.cc |    6 +++---
 beast-gtk/testgui.cc |    2 +-
 beast-gtk/tsmview.cc |    2 +-
 configure.ac         |    8 ++++----
 docs/Makefile.am     |    2 +-
 sfi/glib-extra.cc    |    2 +-
 sfi/glib-extra.hh    |    2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 502201b..750789b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ site site-preview site-update site-update-all site-update-pages site-update-gall
        @$(MAKE) -C web/ $(AM_MAKEFLAGS) $@
 
 # === doc/ files ===
-maindocsdir   = $(pkgdocdir)/
+maindocsdir   = $(docdir)/
 maindocs_DATA = README.md NEWS
 EXTRA_DIST   += $(maindocs_DATA)
 
diff --git a/beast-gtk/bstapp.cc b/beast-gtk/bstapp.cc
index 6149544..5d49572 100644
--- a/beast-gtk/bstapp.cc
+++ b/beast-gtk/bstapp.cc
@@ -1020,7 +1020,7 @@ app_action_exec (gpointer data,
     BROWSE_LOCAL_URL:
       if (docs_url)
         {
-          gchar *local_url = g_strconcat ("file://", bse_installpath (BSE_INSTALLPATH_PKGDOCDIR).c_str(), 
"/", docs_url, NULL);
+          gchar *local_url = g_strconcat ("file://", bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str(), "/", 
docs_url, NULL);
           sfi_url_show (local_url);
           g_free (local_url);
         }
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index e1f3fa8..b1a320e 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -114,7 +114,7 @@ main (int   argc,
   /* initialize Gtk+ Extension Kit */
   gxk_init ();
   /* documentation search paths */
-  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDOCDIR).c_str());
+  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
   gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
   gxk_text_add_tsm_path (".");
   /* now, we can popup the splash screen */
@@ -628,7 +628,7 @@ bst_args_process (int *argc_p, char **argv)
          const char *arg = argv[i][12 - 1] == '=' ? argv[i] + 12 : (argv[i + 1] ? argv[i + 1] : "");
           char *freeme = NULL;
           if (strcmp (arg, "docs") == 0)
-           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_PKGDOCDIR).c_str());
+           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
          else if (strcmp (arg, "images") == 0)
            printout ("%s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
          else if (strcmp (arg, "locale") == 0)
@@ -713,7 +713,7 @@ bst_exit_print_version (void)
   printout ("%s", Rapicorn::cpu_info().c_str());
   printout ("\n");
   printout ("Binaries:        %s\n", bse_installpath (BSE_INSTALLPATH_BINDIR).c_str());
-  printout ("Doc Path:        %s\n", bse_installpath (BSE_INSTALLPATH_PKGDOCDIR).c_str());
+  printout ("Doc Path:        %s\n", bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
   printout ("Image Path:      %s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
   printout ("Locale Path:     %s\n", bse_installpath (BSE_INSTALLPATH_LOCALEBASE).c_str());
   printout ("Keyrc Path:      %s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_KEYS).c_str());
diff --git a/beast-gtk/testgui.cc b/beast-gtk/testgui.cc
index 345cab6..4804800 100644
--- a/beast-gtk/testgui.cc
+++ b/beast-gtk/testgui.cc
@@ -90,7 +90,7 @@ main (int   argc,
   /* initialize Gtk+ Extension Kit */
   gxk_init ();
   /* add documentation search paths */
-  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDOCDIR).c_str());
+  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
   gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
   gxk_text_add_tsm_path (".");
   /* initialize BEAST GUI components */
diff --git a/beast-gtk/tsmview.cc b/beast-gtk/tsmview.cc
index d38bf83..ab39b47 100644
--- a/beast-gtk/tsmview.cc
+++ b/beast-gtk/tsmview.cc
@@ -50,7 +50,7 @@ main (int   argc,
   if (!title)
     title = g_strdup (".");
   gxk_text_add_tsm_path (".");
-  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDOCDIR).c_str());
+  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
   gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
   sctext = gxk_scroll_text_create (GXK_SCROLL_TEXT_NAVIGATABLE | flags, NULL);
   gxk_scroll_text_enter (sctext, title);
diff --git a/configure.ac b/configure.ac
index 3392612..f79d0a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,13 +73,13 @@ LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
 AC_SUBST(LT_VERSION_INFO)
 
 # Define package directories per major/minor version
-bselibdir="\${libdir}/bse-$MAJOR"
+bselibdir="\${libdir}/bse-$MAJOR.$MINOR.$MICRO"
 pkgdatadir="\${datadir}/beast-$MAJOR"
-pkgdocdir="\${datarootdir}/doc/beast-$MAJOR"
+docdir="${datarootdir}/doc/beast" # "beast-$MAJOR"
 # Substitute directories in Makefiles
 AC_SUBST(bselibdir)
 AC_SUBST(pkgdatadir)
-AC_SUBST(pkgdocdir)
+AC_SUBST(docdir)
 # Provide directories for C++
 bak_prefix="$prefix" ; bak_exec_prefix="$exec_prefix" ; bak_libdir="$libdir" ; 
bak_datarootdir="$datarootdir" ; bak_datadir="$datadir"
 test "x$prefix" = xNONE && prefix="$ac_default_prefix" ; test "x$exec_prefix" = xNONE && 
exec_prefix="$prefix"
@@ -90,7 +90,7 @@ AC_DEFINE_UNQUOTED(INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"], [Base d
 AC_DEFINE_UNQUOTED(INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA plugins])
 AC_DEFINE_UNQUOTED(INSTALLPATH_BSELIBDIR, ["`eval echo ${bselibdir}`"], [Directory to install plugins and 
drivers])
 AC_DEFINE_UNQUOTED(INSTALLPATH_PKGDATADIR, ["`eval echo ${pkgdatadir}`"], [Directory to install samples, 
effects, scripts, etc])
-AC_DEFINE_UNQUOTED(INSTALLPATH_PKGDOCDIR, ["`eval echo ${pkgdocdir}`"], [Directory to install documentation])
+AC_DEFINE_UNQUOTED(INSTALLPATH_DOCDIR, ["`eval echo ${docdir}`"], [Directory to install documentation])
 AC_DEFINE_UNQUOTED(INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
 prefix="$bak_prefix" ; exec_prefix="$bak_exec_prefix" ; libdir="$bak_libdir" ; 
datarootdir="$bak_datarootdir" ; datadir="$bak_datadir"
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 08aac1c..4a25440 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -13,7 +13,7 @@ DOC_VERSION = $(VERSION): $(DSC_VERSION)
 EXTRA_DIST += bse-categories.txt interpolation.txt ChangeLog.svn
 
 # == Doxygen Install Rules ==
-htmldocsbase  = $(pkgdocdir)
+htmldocsbase  = $(docdir)
 htmldocsdir   = ${htmldocsbase}/html
 htmldocs_DATA = html/doc-version               # build dependency for doxygen docs
 htmlparent    = $(if $(findstring \#,   \ INGIT@..), $(srcdir), $(builddir))
diff --git a/sfi/glib-extra.cc b/sfi/glib-extra.cc
index 960b5ca..1f06ffc 100644
--- a/sfi/glib-extra.cc
+++ b/sfi/glib-extra.cc
@@ -1037,7 +1037,7 @@ bse_installpath (BseInstallpathType installpath_type)
     case BSE_INSTALLPATH_BINDIR:                        return INSTALLPATH_BINDIR;
     case BSE_INSTALLPATH_LOCALEBASE:                    return INSTALLPATH_LOCALEBASE;
     case BSE_INSTALLPATH_LADSPA:                        return INSTALLPATH_LADSPA;
-    case BSE_INSTALLPATH_PKGDOCDIR:                     return INSTALLPATH_PKGDOCDIR;
+    case BSE_INSTALLPATH_DOCDIR:                        return INSTALLPATH_DOCDIR;
     case BSE_INSTALLPATH_USER_DATA:                     return INSTALLPATH_USER_DATA;
     case BSE_INSTALLPATH_BSELIBDIR:                     return INSTALLPATH_BSELIBDIR;
     case BSE_INSTALLPATH_BSELIBDIR_PLUGINS:             return bse_installpath (BSE_INSTALLPATH_BSELIBDIR) + 
"/plugins";
diff --git a/sfi/glib-extra.hh b/sfi/glib-extra.hh
index c136ec7..fb84533 100644
--- a/sfi/glib-extra.hh
+++ b/sfi/glib-extra.hh
@@ -310,7 +310,7 @@ enum BseInstallpathType {
   BSE_INSTALLPATH_BINDIR,
   BSE_INSTALLPATH_LOCALEBASE,
   BSE_INSTALLPATH_LADSPA,
-  BSE_INSTALLPATH_PKGDOCDIR,
+  BSE_INSTALLPATH_DOCDIR,
   BSE_INSTALLPATH_USER_DATA,
   BSE_INSTALLPATH_BSELIBDIR,
   BSE_INSTALLPATH_BSELIBDIR_PLUGINS,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]