From ef8432c301409567ca5f0ad94a920f01efd99a96 Mon Sep 17 00:00:00 2001 From: Frederic Culot Date: Fri, 22 Sep 2006 13:11:35 +0000 Subject: moved LOCALEDIR definition from configure.ac to src/Makefile.am --- configure.ac | 6 +----- src/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 53915d8..90e45c1 100755 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. # -# $calcurse: configure.ac,v 1.3 2006/09/09 20:00:16 culot Exp $ +# $calcurse: configure.ac,v 1.4 2006/09/22 13:11:35 culot Exp $ AC_PREREQ(2.59) AC_INIT(calcurse, 1.6, frederic@culot.org) @@ -45,8 +45,4 @@ AC_FUNC_MKTIME AC_FUNC_STRFTIME AC_CHECK_FUNCS([floor mkdir strchr]) -# Define LOCALEDIR -AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale", - [The directory in which locale data will be stored]) - AC_OUTPUT(Makefile src/Makefile po/Makefile.in po/Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 779aaca..faadcd6 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $calcurse: Makefile.am,v 1.2 2006/09/09 20:04:23 culot Exp $ +# $calcurse: Makefile.am,v 1.3 2006/09/22 13:12:06 culot Exp $ AUTOMAKE_OPTIONS= gnu bin_PROGRAMS= calcurse @@ -10,5 +10,8 @@ calcurse_SOURCES= calcurse.c apoint.c event.c todo.c utils.c\ day.h recur.h notify.h LIBS= -lncurses -lpthread -lm LDADD= @LTLIBINTL@ +datadir= @datadir@ +localedir= $(datadir)/locale +DEFS= -DLOCALEDIR=\"$(localedir)\" @DEFS@ man_MANS= calcurse.1 EXTRA_DIST= calcurse.1 -- cgit v1.2.3-54-g00ecf