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 | ea4e844b93717e4e90d0e43c0d948722609abe27 (patch) | |
| tree | f44971c7c3536d6323567a591675d51d9ec229c5 | |
| parent | 49c3c4dffa813e5da1e77b898d5df4bf7559527e (diff) | |
| download | dmapi-dev-ea4e844b93717e4e90d0e43c0d948722609abe27.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 | ||||
| -rw-r--r-- | m4/package_xfslibs.m4 | 13 |
3 files changed, 19 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules index 7308450..28e3f61 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,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` diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index be9a74d..af718c2 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -76,6 +76,19 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE], AC_SUBST(libhdl) ]) +AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE], + [ + AC_MSG_CHECKING([libhandle.a for IRIX]) + libhdl="`pwd`/../irix/libhandle/libhandle.a" + if ! test -f $libhdl; then + echo 'no' + echo 'FATAL ERROR: could not find IRIX XFS handle library.' + exit 1 + fi + echo 'yes' + AC_SUBST(libhdl) + ]) + AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO], [ AC_MSG_CHECKING([xfsctl from xfs/libxfs.h]) AC_TRY_LINK([#include <xfs/libxfs.h>], [ int x = xfsctl(0, 0, 0, 0); ], |