diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2004-10-10 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * src/Makefile.am: + + Remove duplicate AM_PROG_INTLTOOL, fixes bug #155028. + Use AM_GLIB_DEFINE_LOCALEDIR to define locale dir. + 2004-10-08 Christian Persch <chpe@cvs.gnome.org> * src/ephy-tab.c: diff --git a/configure.ac b/configure.ac index 8250b6d4d..5ef759c8e 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,6 @@ AC_PROG_CC AC_PROG_CXX AM_PROG_CC_STDC AC_HEADER_STDC -AC_PROG_INTLTOOL AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_SUBST([AM_CXXFLAGS]) @@ -381,6 +380,7 @@ GETTEXT_PACKAGE=epiphany AC_SUBST([GETTEXT_PACKAGE]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package]) AM_GLIB_GNU_GETTEXT +AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR]) dnl uninstalled share dir to search data AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir]) diff --git a/src/Makefile.am b/src/Makefile.am index 656781d4c..93816cc44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,8 +10,7 @@ INCLUDES = \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" \ -DDATADIR=\""$(datadir)"\" \ - -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" if MAINTAINER_MODE INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ |