First step of moving translations from src/pacman/po to po/

Move the translations from src/pacman/po to just po/ so we can include the
scripts gettext translations in the same message catalog as that of the
pacman frontend. The libalpm message catalog, for now, will remain a separate
existence.

Signed-off-by: Dan McGee <dan@archlinux.org>

Makefile.am

@@ -1,6 +1,4 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib
-
-#DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot
+SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc po pactest contrib
 
 # Some files automatically included, so they aren't specified below:
 #   AUTHORS, COPYING, NEWS, README

configure.ac

@@ -233,13 +233,13 @@ AC_CONFIG_FILES([
 lib/libalpm/Makefile
 lib/libalpm/po/Makefile.in
 src/pacman/Makefile
-src/pacman/po/Makefile.in
 src/util/Makefile
 scripts/Makefile
 doc/Makefile
 etc/Makefile
 etc/pacman.d/Makefile
 etc/abs/Makefile
+po/Makefile.in
 pactest/Makefile
 contrib/Makefile
 Makefile

lib/libalpm/alpm.c

@@ -52,6 +52,7 @@ int SYMEXPORT alpm_initialize(void)
 	if(handle == NULL) {
 		RET_ERR(PM_ERR_MEMORY, -1);
 	}
+	bindtextdomain("libalpm", LOCALEDIR);
 
 	return(0);
 }

po/Makevars

@@ -5,7 +5,7 @@ DOMAIN = pacman
 
 # These two variables depend on the location of this directory.
 subdir = po
-top_builddir = ../../../
+top_builddir = ../
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = \

po/POTFILES.in

@@ -1,5 +1,6 @@
 # List of source files with translatable strings
 
+# pacman frontend source files
 src/pacman/add.c
 src/pacman/callback.c
 src/pacman/conf.c
@@ -10,3 +11,12 @@ src/pacman/query.c
 src/pacman/remove.c
 src/pacman/sync.c
 src/pacman/util.c
+
+# scripts with gettext translations
+scripts/abs.in
+scripts/gensync.in
+scripts/makepkg.in
+scripts/pacman-optimize.in
+scripts/repo-add.in
+scripts/repo-remove.in
+scripts/updatesync.in

src/pacman/Makefile.am

@@ -1,5 +1,3 @@
-SUBDIRS = po
-
 # paths set at make time
 conffile  = ${sysconfdir}/pacman.conf