From c6e8074f628eb380883dd3b0cbdc60eb7ef6d0f5 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:59:58 +0000 Subject: s/DOMAIN/APT_DOMAIN/, as /usr/include/math.h defines DO... Author: doogie Date: 2002-11-11 07:00:16 GMT s/DOMAIN/APT_DOMAIN/, as /usr/include/math.h defines DOMAIN to 1, and breaks us. --- buildlib/apti18n.h.in | 6 +++--- buildlib/library.mak | 2 +- buildlib/podomain.mak | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'buildlib') diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index 9bdd6bbca..4c32e585e 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -1,5 +1,5 @@ // -*- mode: cpp; mode: fold -*- -// $Id: apti18n.h.in,v 1.4 2002/10/16 05:24:02 jgg Exp $ +// $Id: apti18n.h.in,v 1.5 2002/11/11 07:00:16 doogie Exp $ /* Internationalization macros for apt. This header should be included last in each C file. */ @@ -10,8 +10,8 @@ #if USE_NLS==yes && USE_INCLUDED_LIBINTL==no // apt will use the gettext implementation of the C library # include -# ifdef DOMAIN -# define _(x) dgettext(DOMAIN,x) +# ifdef APT_DOMAIN +# define _(x) dgettext(APT_DOMAIN,x) # else # define _(x) gettext(x) # endif diff --git a/buildlib/library.mak b/buildlib/library.mak index 9f8b78541..de8833cbb 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -8,7 +8,7 @@ # $(LIBRARY) - The name of the library without lib or .so # $(MAJOR) - The major version number of this library # $(MINOR) - The minor version number of this library -# $(DOMAIN) - The text domain for this library +# $(APT_DOMAIN) - The text domain for this library # All output is writtin to .opic files in the build directory to # signify the PIC output. diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index 2bf72ac58..602e9e080 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -5,9 +5,9 @@ # CPPFLAG for the compilation. MY_DOMAIN := $(PACKAGE) -ifdef DOMAIN -$($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DDOMAIN='"$(DOMAIN)"' -MY_DOMAIN := $(DOMAIN) +ifdef APT_DOMAIN +$($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DAPT_DOMAIN='"$(APT_DOMAIN)"' +MY_DOMAIN := $(APT_DOMAIN) endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) -- cgit v1.2.3