From 7eac835b576cea488f34260835a6a7cbe2c0198a Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 4 Aug 2006 13:42:00 +0000 Subject: [PATCH] Merge the uid/gid username/groupname install target fixup to all packages. Merge of master-melb:xfs-cmds:26582a by kenmcd. --- aclocal.m4 | 6 +++--- m4/package_globals.m4 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0f40c0a1..dd65e1cd 100644 --- 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 665afc83..72fbbb78 100644 --- 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) -- 2.30.2