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.

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 5a2e6761f5b1ad4d39c2096ae834730d3ba05286..db75e61661bb39374520b2c6f29a7df39169052a 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: init.cc,v 1.18 2002/10/16 05:21:33 jgg Exp $
+// $Id: init.cc,v 1.19 2002/11/11 07:00:16 doogie Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -96,7 +96,7 @@ bool pkgInitConfig(Configuration &Cnf)
    
    if (Cnf.Exists("Dir::Locale"))
    {  
-      bindtextdomain(DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
+      bindtextdomain(APT_DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
       bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
    }
    

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 3a51849ba8fcc3ed020ce4fdf2dc7894fab0bf31..0f7f879be404aa6e1b4da2c0773fd23af367680a 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -16,7 +16,7 @@ LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
 MAJOR=3.3
 MINOR=0
 SLIBS=$(PTHREADLIB)
-DOMAIN:=libapt-pkg$(MAJOR)
+APT_DOMAIN:=libapt-pkg$(MAJOR)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \

diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index 9bdd6bbca65a5a8beab2d09599b3fadaf115cb74..4c32e585ea418baf3c4d3cce79ebc51bf302d49d 100644 (file)
--- 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 <libintl.h>
-# 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 9f8b78541a4ccff54714de5303a2df3c7e8b909d..de8833cbbbc805d2a57cad30ea816156138affc6 100644 (file)
--- 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 2bf72ac580f067aa7c69172b31633f6860a437c9..602e9e080f3f337dd7854773e927a23b0f2f2577 100644 (file)
--- 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)

diff --git a/methods/makefile b/methods/makefile
index dcdb0dc46f0d5bacca90f31bf5f5e7c2adc1e6bb..5700caa23ce8df29ec1dbeaf220ce71c97c85c8f 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -8,7 +8,7 @@ BIN := $(BIN)/methods
 
 # FIXME..
 LIB_APT_PKG_MAJOR = 3.3
-DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
 PROGRAM=file