diff options
| author | Nathan Scott <nathans@sgi.com> | 2005-11-07 02:48:13 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-11-07 02:48:13 +0000 |
| commit | f3a91807b98a1853a46826829cf4cf69f90ccebb (patch) | |
| tree | 70f60e43b377fbbdef573e39781457ba9e146dca | |
| parent | 0649a48f6879e6dbd291bb891130c29989c0f83d (diff) | |
| download | attr-f3a91807b98a1853a46826829cf4cf69f90ccebb.tar.gz | |
Keep packaging scripts in sync across all of the packages were maintaining here
Merge of master-melb:xfs-cmds:24301a by kenmcd.
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | m4/package_globals.m4 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules index cc53c34..23f77d5 100755 --- a/debian/rules +++ b/debian/rules @@ -12,8 +12,8 @@ pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT; stdenv = @GZIP=-q; export GZIP; -options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; DISTRIBUTION="debian"; \ - export DEBUG OPTIMIZER DISTRIBUTION; +options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ + INSTALL_USER=root INSTALL_GROUP=root ; checkdir = test -f debian/rules build: built diff --git a/m4/package_globals.m4 b/m4/package_globals.m4 index 25b387d..c28e1a1 100644 --- a/m4/package_globals.m4 +++ b/m4/package_globals.m4 @@ -27,12 +27,12 @@ AC_DEFUN([AC_PACKAGE_GLOBALS], malloc_lib="$MALLOCLIB" AC_SUBST(malloc_lib) - PKG_USER=${INSTALL_USER:-'root'} - pkg_user="$PKG_USER" + pkg_user=`id -u` + test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER" AC_SUBST(pkg_user) - PKG_GROUP=${INSTALL_GROUP:-'root'} - pkg_group="$PKG_GROUP" + pkg_group=`id -g` + test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP" AC_SUBST(pkg_group) pkg_distribution=`uname -s` |