Updates to acl/attr I18N (final). Sync up dmapi scripts with the I18N

aware versions - dmapi doesn't have any strings, so this is just keeping
scripts in sync.
Sync up dmapi scripts with the I18N aware versions - dmapi doesn't have any
strings (just a library), so this is just keeping scripts in sync.

4 files changed, 79 insertions, 43 deletions

diff --git a/configure.in b/configure.in
index 5b8e762..93ad8c5 100644
--- a/configure.in
+++ b/configure.in
@@ -7,8 +7,9 @@ AC_SUBST(pkg_name)
 # Note: the following environment variables may be set to override the
 # defaults (to change paths and/or executables, build parameters, etc):
 #
-#   DEBUG  OPTIMIZER  MAKE  CC  LD  TAR  ZIP  RPM  AWK  SED  ECHO
-#   LIBTOOL  MALLOCLIB  DISTRIBUTION  PACKAGE_BUILDER
+#   DEBUG  OPTIMIZER  MALLOCLIB
+#   PLATFORM  DISTRIBUTION  BUILDER
+#   MAKE  CC  LD  TAR  ZIP  AWK  SED  ECHO  RPM  LIBTOOL
 #
 
 DEBUG=${DEBUG:-'-DDEBUG'}		# -DNDEBUG
@@ -35,12 +36,16 @@ pkg_release=$PKG_BUILD
 AC_SUBST(pkg_version)
 AC_SUBST(pkg_release)
 
-pkg_distribution="SGI XFS"
+pkg_platform=`uname -s`
+pkg_distribution="Generic $pkg_platform"
+pkg_platform=`echo $pkg_platform | tr 'A-Z' 'a-z'`
+test -z "$PLATFORM" || pkg_platform="$PLATFORM"
 test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
 AC_SUBST(pkg_distribution)
+AC_SUBST(pkg_platform)
 
 pkg_builder=`id -u -n`@`hostname`
-test -z "$PACKAGE_BUILDER" || pkg_builder="$PACKAGE_BUILDER"
+test -z "$BUILDER" || pkg_builder="$BUILDER"
 AC_SUBST(pkg_builder)
 
 dnl check if user wants their own C compiler
@@ -68,6 +73,11 @@ test -z "$ZIP" && AC_PATH_PROG(ZIP, gzip, /bin/gzip)
 zip=$ZIP
 AC_SUBST(zip)
 
+dnl check if the makedepend program is available
+test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+makedepend=$MAKEDEPEND
+AC_SUBST(makedepend)
+
 dnl check if the rpm program is available
 test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm)
 rpm=$RPM
@@ -89,14 +99,8 @@ if test $rpm_version -ge 4; then
 else
 	rpmbuild=$RPM
 fi
-
 AC_SUBST(rpmbuild)
 
-dnl check if the makedepend program is available
-test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
-makedepend=$MAKEDEPEND
-AC_SUBST(makedepend)
-
 dnl check if symbolic links are supported
 AC_PROG_LN_S
 
diff --git a/include/builddefs.in b/include/builddefs.in
index ac7fc59..9d00793 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -42,42 +42,50 @@ MALLOCLIB = @malloc_lib@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-PKG_NAME = @pkg_name@
-PKG_RELEASE = @pkg_release@
-PKG_VERSION = @pkg_version@
-PKG_DISTRIBUTION = @pkg_distribution@
-PKG_BUILDER = @pkg_builder@
-PKG_BIN_DIR = @bindir@
-PKG_SBIN_DIR = @sbindir@
-PKG_LIB_DIR = @libdir@
-PKG_DEVLIB_DIR = @libexecdir@
-PKG_INC_DIR = @includedir@/xfs
-PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
+PKG_NAME	= @pkg_name@
+PKG_RELEASE	= @pkg_release@
+PKG_VERSION	= @pkg_version@
+PKG_PLATFORM	= @pkg_platform@
+PKG_DISTRIBUTION= @pkg_distribution@
+PKG_BUILDER	= @pkg_builder@
+PKG_BIN_DIR	= @bindir@
+PKG_SBIN_DIR	= @sbindir@
+PKG_LIB_DIR	= @libdir@
+PKG_DEVLIB_DIR	= @libexecdir@
+PKG_INC_DIR	= @includedir@/attr
+PKG_MAN_DIR	= @mandir@
+PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+PKG_LOCALE_DIR	= @datadir@/locale
 
-CC	= @cc@
-LD	= @ld@
-AWK	= @awk@
-SED	= @sed@
-MAKE	= @make@
-ECHO	= @echo@
-LN_S	= @LN_S@
-ZIP	= @zip@
-TAR	= @tar@
-RPM	= @rpm@
-RPMBUILD= @rpmbuild@
-MSGFMT	= @msgfmt@
+CC		= @cc@
+LD		= @ld@
+AWK		= @awk@
+SED		= @sed@
+TAR		= @tar@
+ZIP		= @zip@
+MAKE		= @make@
+ECHO		= @echo@
+LN_S		= @LN_S@
+LIBTOOL		= @LIBTOOL@
+MAKEDEPEND	= @makedepend@
 
-RPM_VERSION = @rpm_version@
-HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
-MAKEDEPEND = @makedepend@
+RPM		= @rpm@
+RPMBUILD	= @rpmbuild@
+RPM_VERSION	= @rpm_version@
 
-LIBTOOL	= @LIBTOOL@
 ENABLE_SHARED = @enable_shared@
+HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
+
+ifeq ($(PKG_PLATFORM),linux)
+PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+endif
+
+GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -I$(TOPDIR)/include \
+	  -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
+	  -DPACKAGE=\"$(PKG_NAME)\"
 
-CFLAGS += $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall \
-	-D_GNU_SOURCE $(LCFLAGS) -I$(TOPDIR)/include \
-	-DVERSION=\"$(PKG_VERSION)\" -D_FILE_OFFSET_BITS=64
+# Global, Platform, Local CFLAGS
+CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
 
 include $(TOPDIR)/include/buildmacros
 
diff --git a/include/buildmacros b/include/buildmacros
index 33b780c..b9210af 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -42,8 +42,12 @@ LDLIBS = $(LLDLIBS) $(MALLOCLIB)
 
 MAKEOPTS = --no-print-directory
 SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
-DIRT = $(LDIRT) dep dep.bak $(OBJECTS) $(LTOBJECTS) *.[1-9].gz \
-	$(LTCOMMAND) $(LTLIBRARY)
+
+DEPDIRT = dep dep.bak
+MANDIRT = *.[1-9].gz
+PODIRT = *.tmpo *.mo
+CDIRT = $(OBJECTS) $(LTOBJECTS) $(LTCOMMAND) $(LTLIBRARY)
+DIRT = $(LDIRT) $(DEPDIRT) $(MANDIRT) $(PODIRT) $(CDIRT)
 
 OBJECTS = $(ASFILES:.s=.o) \
           $(CFILES:.c=.o) \
@@ -137,6 +141,15 @@ INSTALL_MAN = \
 		done; \
 	done
 
+ifeq ($(ENABLE_GETTEXT),yes)
+INSTALL_LINGUAS = \
+	@for l in $(LINGUAS); do \
+		ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
+		$(INSTALL) -m 755 -d $$ldir; \
+		$(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \
+	done
+endif
+
 SUBDIRS_MAKERULE = \
 	@for d in $(SUBDIRS) ""; do \
 		if test -d "$$d" -a ! -z "$$d"; then \
diff --git a/include/buildrules b/include/buildrules
index a6a0116..6e186a7 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -55,6 +55,17 @@ $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
 	$(LTCOMPILE) -c $<
 endif
 
+ifdef LINGUAS
+%.pot: $(XGETTEXTFILES)
+	$(XGETTEXT) -o $@ $(XGETTEXTFILES)
+
+%.tmpo: %.po
+	$(MSGMERGE) -o $@ $< $(PKG_NAME).pot
+
+%.mo: %.tmpo
+	$(MSGFMT) -o $@ $<
+endif
+
 source :
 	$(SOURCE_MAKERULE)