diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-08-04 13:42:00 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-08-04 13:42:00 +0000 |
| commit | 52b0ae8fe898aca2f39d5f6b9e4fcb411edbeda7 (patch) | |
| tree | 9a58b2d80782553e4d43f2a85299ebeb7ad85052 | |
| parent | 410a9bfcf57da22a3a9464e1131214da0e240864 (diff) | |
| download | dmapi-dev-52b0ae8fe898aca2f39d5f6b9e4fcb411edbeda7.tar.gz | |
Merge the uid/gid username/groupname install target fixup to all packages.
Merge of master-melb:xfs-cmds:26582a by kenmcd.
| -rw-r--r-- | aclocal.m4 | 15 | ||||
| -rw-r--r-- | m4/package_globals.m4 | 6 |
2 files changed, 12 insertions, 9 deletions
@@ -73,7 +73,7 @@ AC_DEFUN([AC_MULTILIB], AC_SUBST(libdirsuffix) ]) -# +# # 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 @@ -102,11 +102,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) @@ -291,7 +291,8 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS], libxfs="-lxfs" test -f `pwd`/../xfsprogs/libxfs/libxfs.la && \ libxfs="`pwd`/../xfsprogs/libxfs/libxfs.la" - test -f /usr/lib/libxfs.la && libxfs="/usr/lib/libxfs.la" + test -f ${libexecdir}${libdirsuffix}/libxfs.la && \ + libxfs="${libexecdir}${libdirsuffix}/libxfs.la" AC_SUBST(libxfs) ]) @@ -306,7 +307,8 @@ AC_DEFUN([AC_PACKAGE_NEED_OPEN_BY_FSHANDLE], libhdl="-lhandle" test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \ libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la" - test -f /usr/lib/libhandle.la && libhdl="/usr/lib/libhandle.la" + test -f ${libexecdir}${libdirsuffix}/libhandle.la && \ + libhdl="${libexecdir}${libdirsuffix}/libhandle.la" AC_SUBST(libhdl) ]) @@ -321,7 +323,8 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE], libhdl="-lhandle" test -f `pwd`/../xfsprogs/libhandle/libhandle.la && \ libhdl="`pwd`/../xfsprogs/libhandle/libhandle.la" - test -f /usr/lib/libhandle.la && libhdl="/usr/lib/libhandle.la" + test -f ${libexecdir}${libdirsuffix}/libhandle.la && \ + libhdl="${libexecdir}${libdirsuffix}/libhandle.la" AC_SUBST(libhdl) ]) diff --git a/m4/package_globals.m4 b/m4/package_globals.m4 index 665afc8..72fbbb7 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) |