Updating branch refs/heads/stephan/icon-bar
to f268fdc32beafc1959b6d02f4fc454745bbc04c7 (commit)
from 40aabfdbed1006c59e8db1b7d79971b6991d4b82 (commit)
commit f268fdc32beafc1959b6d02f4fc454745bbc04c7
Author: Stephan Arts <step...@xfce.org>
Date: Sat Jan 14 16:46:25 2012 +0100
Revert "Cleanup DOCDIR and RISTRETTO_HELP_LOCATION"
This reverts commit 06cfd28df55a2a43868297bfddb57d276714d153.
src/Makefile.am | 1 +
src/main_window.c | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index bf23216..c5e810e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ ristretto_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(LIBX11_CFLAGS) \
+ -DDOCDIR=\"$(DESTDIR)$(docdir)\" \
-DDATADIR=\"$(datadir)\" \
-DSRCDIR=\"$(top_srcdir)\" \
-DLOCALEDIR=\"$(localedir)\"
diff --git a/src/main_window.c b/src/main_window.c
index f5190cc..2e26e14 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -55,6 +55,11 @@
#define RISTRETTO_APP_TITLE _("Image Viewer")
#endif
+#ifndef RISTRETTO_HELP_LOCATION
+#define RISTRETTO_HELP_LOCATION "file://"DOCDIR"/html/C/index.html"
+#endif
+
+
#define RSTTO_RECENT_FILES_APP_NAME "ristretto"
#define RSTTO_RECENT_FILES_GROUP "Graphics"
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
