- remove hard-coded reference to /usr/share/locale and replace it
authorpmatilai <pmatilai>
Sat, 27 May 2006 08:30:51 +0000 (08:30 +0000)
committerpmatilai <pmatilai>
Sat, 27 May 2006 08:30:51 +0000 (08:30 +0000)
  with corresponding auto*magic (Ralf)

apt-pkg/Makefile.am
apt-pkg/Makefile.in
apt-pkg/rpm/rpmsystem.cc

index f5acf90..85391de 100644 (file)
@@ -1,3 +1,4 @@
+localedir = $(datadir)/locale
 
 lib_LTLIBRARIES = libapt-pkg.la
 
@@ -5,6 +6,7 @@ libapt_pkg_la_LIBADD = @RPMLIBS@
 libapt_pkg_la_LDFLAGS = -version-info 2:0:0 -release @GLIBC_VER@-@LIBSTDCPP_VER@
 
 AM_CPPFLAGS = -DLIBDIR=\"$(libdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
 AM_CPPFLAGS += -I$(top_srcdir)/lua/include -I$(top_srcdir)/lua/local
 
 if WITH_LUA
index 663e8e0..788cbd0 100644 (file)
@@ -240,11 +240,13 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+localedir = $(datadir)/locale
 lib_LTLIBRARIES = libapt-pkg.la
 libapt_pkg_la_LIBADD = @RPMLIBS@ $(am__append_1)
 libapt_pkg_la_LDFLAGS = -version-info 2:0:0 -release @GLIBC_VER@-@LIBSTDCPP_VER@
 AM_CPPFLAGS = -DLIBDIR=\"$(libdir)\" -DPKGDATADIR=\"$(pkgdatadir)\" \
-       -I$(top_srcdir)/lua/include -I$(top_srcdir)/lua/local
+       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/lua/include \
+       -I$(top_srcdir)/lua/local
 libapt_pkg_la_SOURCES = \
        contrib/cdromutl.cc \
        contrib/cdromutl.h \
index 1f9d6be..2561f8a 100644 (file)
@@ -141,7 +141,7 @@ bool rpmSystem::Initialize(Configuration &Cnf)
    Cnf.CndSet("Dir::Etc::translatelist", "translate.list");
    Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
    Cnf.CndSet("Dir::State::prefetch", "prefetch");
-   Cnf.CndSet("Dir::Locale","/usr/share/locale");
+   Cnf.CndSet("Dir::Locale",LOCALEDIR);
    Cnf.CndSet("Acquire::DistroID","Conectiva"); // hee hee
    Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
    Cnf.CndSet("Acquire::CDROM::Copy-All", "true");