Minor userspace build changes, keeping packages in sync.

6 files changed, 17 insertions, 13 deletions

diff --git a/build/Makefile b/build/Makefile
index 8ca7047..f20beea 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -42,7 +42,7 @@ LDIRT = *-manifest *.gz $(TOPDIR)/$(PKG_NAME)-*
 SUBDIRS = tar rpm
 
 # nothing to build here (it's all packaging)
-default install install-dev :
+default install install-dev install-lib:
 
 include $(BUILDRULES)
 
diff --git a/build/rpm/Makefile b/build/rpm/Makefile
index b980f67..112c2a3 100644
--- a/build/rpm/Makefile
+++ b/build/rpm/Makefile
@@ -85,7 +85,6 @@ ${SPECF} : ${SPECF}.in
 	    -e's|@pkg_version@|$(PKG_VERSION)|g' \
 	    -e's|@pkg_release@|$(PKG_RELEASE)|g' \
 	    -e's|@pkg_distribution@|$(PKG_DISTRIBUTION)|g' \
-	    -e's|@pkg_builder@|$(PKG_BUILDER)|g' \
 	    -e's|@build_root@|$(DIST_ROOT)|g' \
 	    -e'/^BuildRoot: *$$/d' \
 	    -e's|@make@|$(MAKE)|g' < $< > $@
diff --git a/build/tar/Makefile b/build/tar/Makefile
index 494d10b..be23286 100644
--- a/build/tar/Makefile
+++ b/build/tar/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -36,7 +36,7 @@ include $(TOPDIR)/include/builddefs
 BINTAR=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 LDIRT = *.gz
 
-default install install-dev :
+default install install-dev install-lib:
 
 include $(BUILDRULES)
 
diff --git a/configure.in b/configure.in
index 93ad8c5..e698477 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_SUBST(pkg_name)
 # defaults (to change paths and/or executables, build parameters, etc):
 #
 #   DEBUG  OPTIMIZER  MALLOCLIB
-#   PLATFORM  DISTRIBUTION  BUILDER
+#   PLATFORM  DISTRIBUTION  INSTALL_USER  INSTALL_GROUP
 #   MAKE  CC  LD  TAR  ZIP  AWK  SED  ECHO  RPM  LIBTOOL
 #
 
@@ -44,9 +44,13 @@ test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
 AC_SUBST(pkg_distribution)
 AC_SUBST(pkg_platform)
 
-pkg_builder=`id -u -n`@`hostname`
-test -z "$BUILDER" || pkg_builder="$BUILDER"
-AC_SUBST(pkg_builder)
+pkg_user=root
+test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"
+AC_SUBST(pkg_user)
+
+pkg_group=root
+test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
+AC_SUBST(pkg_group)
 
 dnl check if user wants their own C compiler
 test -z "$CC" && AC_PROG_CC
diff --git a/include/builddefs.in b/include/builddefs.in
index a99b1ff..5957c51 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2002-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -43,11 +43,12 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 PKG_NAME	= @pkg_name@
+PKG_USER	= @pkg_user@
+PKG_GROUP	= @pkg_group@
 PKG_RELEASE	= @pkg_release@
 PKG_VERSION	= @pkg_version@
 PKG_PLATFORM	= @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BUILDER	= @pkg_builder@
 PKG_BIN_DIR	= @bindir@
 PKG_SBIN_DIR	= @sbindir@
 PKG_LIB_DIR	= @libdir@
diff --git a/include/buildmacros b/include/buildmacros
index 19be589..54044f4 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2002-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -38,7 +38,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
 # during the "dist" phase (packaging).
 
 LDFLAGS = $(LLDFLAGS)
-LDLIBS = $(LLDLIBS) $(MALLOCLIB)
+LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
 
 MAKEOPTS = --no-print-directory
 SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
@@ -54,7 +54,7 @@ OBJECTS = $(ASFILES:.s=.o) \
           $(LFILES:.l=.o) \
           $(YFILES:%.y=%.tab.o)
 
-INSTALL	= $(TOPDIR)/install-sh -o root -g root
+INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
 
 SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images