Consolidate i18n baggage into AM_GNU_GETTEXT and system.h.

CVS patchset: 2425
CVS date: 1998/10/08 14:59:17

1 files changed, 2 insertions, 5 deletions

diff --git a/rpm.c b/rpm.c
index df9257fd6..75c340ed6 100755
--- a/rpm.c
+++ b/rpm.c
@@ -1,13 +1,10 @@
 #include "system.h"
 
-#include <locale.h>
-
 #include "build/rpmbuild.h"
 
 #include "build.h"
 #include "checksig.h"
 #include "install.h"
-#include "intl.h"
 #include "lib/signature.h"
 #include "popt/popt.h"
 #include "query.h"
@@ -580,8 +577,8 @@ int main(int argc, char ** argv) {
     /* set up the correct locale */
     setlocale(LC_ALL, "" );
 
-    bindtextdomain(RPMNLSPACKAGE, RPMNLSDIR);
-    textdomain(RPMNLSPACKAGE);
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
 
     /* Make a first pass through the arguments, looking for --rcfile */
     /* as well as --arch and --os.  We need to handle that before    */