summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Hallendal <micke@codefactory.se>2002-05-31 16:32:36 +0000
committerMikael Hallendal <hallski@src.gnome.org>2002-05-31 16:32:36 +0000
commitddd22330a018c907fac68d9702b4f331375f800a (patch)
tree989ae1629d914f1c89fa16750ad0d89f52702528
parent29f5f3deec5f2a1e0ea23bdf1f3f462b7e6be78f (diff)
downloadyelp-ddd22330a018c907fac68d9702b4f331375f800a.tar.gz
define yelplocaledir, Fixes #83639
2002-05-31 Mikael Hallendal <micke@codefactory.se> * configure.in (yelp): define yelplocaledir, Fixes #83639 * src/Makefile.am (INCLUDES): use yelplocaledir
-rw-r--r--ChangeLog6
-rw-r--r--configure.in6
-rw-r--r--src/Makefile.am2
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac4cf918..6f40a1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-31 Mikael Hallendal <micke@codefactory.se>
+
+ * configure.in (yelp): define yelplocaledir, Fixes #83639
+
+ * src/Makefile.am (INCLUDES): use yelplocaledir
+
2002-05-31 Ross Burton <ross@burtonini.com>
* src/yelp-window.c (window_about_cb): Tell the about dialog who
diff --git a/configure.in b/configure.in
index 869a02f7..c554b078 100644
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
ALL_LINGUAS="az bg ca da de el es et fr it ja ko lv ms nl nn no pl pt pt_BR ru sk sl sv tr uk vi wa zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
+# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+yelplocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(yelplocaledir)
+
+
if test "x$prefix" = "xNONE"; then
GNOMELOCALEDIR=$ac_default_prefix/share/locale
else
diff --git a/src/Makefile.am b/src/Makefile.am
index 6771728d..7384a83a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DIMAGEDIR=\""$(datadir)/images/yelp"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+ -DGNOMELOCALEDIR=\""$(yelplocaledir)"\"
if HTML_WIDGET_GTKHTML1
html_widget_impl=yelp-html-gtkhtml1.c