Merge the uid/gid username/groupname install target fixup to all packages.

Merge of master-melb:xfs-cmds:26582a by kenmcd.

diff --git a/aclocal.m4 b/aclocal.m4
index 0f40c0a12832303b1290ca1bc3ea07c3124c74b7..dd65e1cd5fb75b0b4934792429e9dad26201ab6d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -199,7 +199,7 @@ AC_DEFUN([AC_PACKAGE_WANT_GDBM],
     AC_SUBST(have_db)
   ])
 
-# 
+#
 # Generic macro, sets up all of the global packaging variables.
 # The following environment variables may be set to override defaults:
 #   DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP
@@ -228,11 +228,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     malloc_lib="$MALLOCLIB"
     AC_SUBST(malloc_lib)
 
-    pkg_user=`id -u`
+    pkg_user=`id -u -n`
     test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"
     AC_SUBST(pkg_user)
 
-    pkg_group=`id -g`
+    pkg_group=`id -g -n`
     test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
     AC_SUBST(pkg_group)
 

diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 665afc8308092d49efe7ad5c000b0e7823cc1951..72fbbb78ac9e998f959d9cd96b196cebf67a6c59 100644 (file)
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -1,4 +1,4 @@
-# 
+#
 # Generic macro, sets up all of the global packaging variables.
 # The following environment variables may be set to override defaults:
 #   DEBUG OPTIMIZER MALLOCLIB PLATFORM DISTRIBUTION INSTALL_USER INSTALL_GROUP
@@ -27,11 +27,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     malloc_lib="$MALLOCLIB"
     AC_SUBST(malloc_lib)
 
-    pkg_user=`id -u`
+    pkg_user=`id -u -n`
     test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"
     AC_SUBST(pkg_user)
 
-    pkg_group=`id -g`
+    pkg_group=`id -g -n`
     test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
     AC_SUBST(pkg_group)