diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-04 20:39:22 +0100 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-04 20:39:22 +0100 |
commit | 86df47fc19e19ab65b74dfbc47d2b9bc50b4aac5 (patch) | |
tree | de018ac89d277a58bb81e7d58f50d925db1d695f | |
parent | c15b169562da6c652c09835f507e88fc0cd28589 (diff) |
--docdir support
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | plugins/gtkui/callbacks.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 18aecca8..978c16b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,7 @@ deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) gme/Game_Music_Emu-0.5.2/gme/libgme.a sid AM_CFLAGS = $(DEPS_CFLAGS) -I$(gmepath) -std=c99 AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -docsdir = $(datadir)/doc/$(PACKAGE) +docsdir = $(docdir) docs_DATA = README COPYING help.txt about.txt diff --git a/configure.ac b/configure.ac index eb34044b..b07a2ab8 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix INSANE_CFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast" -CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\"" +CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\"" PKG_CHECK_MODULES(DEPS, samplerate) PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=1, NO_GTK=1) diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index f24ecea4..a2e5a3f2 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1381,7 +1381,7 @@ void on_help1_activate (GtkMenuItem *menuitem, gpointer user_data) { - show_info_window (PREFIX "/share/doc/deadbeef/help.txt", "Help", &helpwindow); + show_info_window (DOCDIR "/help.txt", "Help", &helpwindow); } static GtkWidget *aboutwindow; @@ -1390,7 +1390,7 @@ void on_about1_activate (GtkMenuItem *menuitem, gpointer user_data) { - show_info_window (PREFIX "/share/doc/deadbeef/about.txt", "About DeaDBeeF " VERSION, &aboutwindow); + show_info_window (DOCDIR "/about.txt", "About DeaDBeeF " VERSION, &aboutwindow); } |