summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-06-01 15:00:25 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-06-01 15:00:25 +0000
commita242f622eaec4d6a5fe19fea11841f4372df22c2 (patch)
treea3819655ed5d6e2442022e0827d171b28e0bb8ed
parent4e2d5154fed8b65c68e3ed9c668ef028475922aa (diff)
downloadmetacity-a242f622eaec4d6a5fe19fea11841f4372df22c2.tar.gz
use $(prefix)/@DATADIRNAME@/locale for localedir to work with Solaris
2002-05-30 Havoc Pennington <hp@pobox.com> * src/Makefile.am (INCLUDES): use $(prefix)/@DATADIRNAME@/locale for localedir to work with Solaris native gettext, patch from Hidetoshi Tajima * src/tools/Makefile.am: ditto
-rw-r--r--ChangeLog8
-rw-r--r--src/Makefile.am2
-rw-r--r--src/tools/Makefile.am2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4096a9fb..25fc6667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-30 Havoc Pennington <hp@pobox.com>
+
+ * src/Makefile.am (INCLUDES): use $(prefix)/@DATADIRNAME@/locale
+ for localedir to work with Solaris native gettext, patch from
+ Hidetoshi Tajima
+
+ * src/tools/Makefile.am: ditto
+
2002-05-31 Havoc Pennington <hp@redhat.com>
* src/theme.c: add MetaImageFillType and implement TILE in
diff --git a/src/Makefile.am b/src/Makefile.am
index 0cd0e858..f2c21990 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS=wm-tester tools themes
-INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(datadir)/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\"
+INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\"
metacity_SOURCES= \
common.h \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 9973db85..61bd3291 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES=@METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
@METACITY_PROPS_CFLAGS@ -DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
-DMETACITY_PROPS_GLADEDIR=\"$(pkgdatadir)/glade\" \
-DMETACITY_PROPS_ICON_DIR=\"$(datadir)/pixmaps\" \
- -DMETACITY_LOCALEDIR=\"$(datadir)/locale\"
+ -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
metacity_message_SOURCES= \
metacity-message.c