diff options
| -rw-r--r-- | build/rpm/Makefile | 1 | ||||
| -rw-r--r-- | build/tar/Makefile | 2 | ||||
| -rw-r--r-- | configure.in | 54 | ||||
| -rw-r--r-- | include/builddefs.in | 5 | ||||
| -rw-r--r-- | include/buildmacros | 6 |
5 files changed, 36 insertions, 32 deletions
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 b1d0561..be23286 100644 --- a/build/tar/Makefile +++ b/build/tar/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000-2002 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 diff --git a/configure.in b/configure.in index 8bd802d..9339465 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,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 # MSGFMT MSGMERGE XGETTEXT # @@ -47,9 +47,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 @@ -118,27 +122,6 @@ test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo) echo=$ECHO AC_SUBST(echo) -dnl check if the msgfmt program is available -test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt) -msgfmt=$MSGFMT -AC_SUBST(msgfmt) - -dnl check if the msgmerge program is available -test -z "$MSGMERGE" && AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge) -msgmerge=$MSGMERGE -AC_SUBST(msgmerge) - -dnl ensure xgettext is installed -test -z "$XGETTEXT" && AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext) -if test "$XGETTEXT" = ""; then - echo - echo 'FATAL ERROR: xgettext does not seem to be installed.' - echo $pkg_name cannot be built without a working gettext installation. - exit 1 -fi -xgettext=$XGETTEXT -AC_SUBST(xgettext) - dnl ensure libtool is installed test -z "$LIBTOOL" && AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin) if test "$LIBTOOL" = ""; then @@ -163,6 +146,27 @@ AC_ARG_ENABLE(gettext, test $enable_gettext = "yes" && AC_DEFINE(ENABLE_GETTEXT) AC_SUBST(enable_gettext) +dnl check if the msgfmt, msgmerge, xgettext programs are available +if test "$enable_gettext" = yes; then + test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt) + msgfmt=$MSGFMT + AC_SUBST(msgfmt) + test -z "$MSGMERGE" && AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge) + msgmerge=$MSGMERGE + AC_SUBST(msgmerge) + + test -z "$XGETTEXT" && AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext) + xgettext=$XGETTEXT + AC_SUBST(xgettext) + + if test "$XGETTEXT" = ""; then + echo + echo 'FATAL ERROR: xgettext does not seem to be installed.' + echo $pkg_name cannot be built without a working gettext installation. + exit 1 + fi +fi + dnl man pages (source) dnl also check if man page source is gzipped dnl (usually on Debian, but not Redhat pre-7.0) diff --git a/include/builddefs.in b/include/builddefs.in index cea6d61..d238e8f 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 @@ -45,11 +45,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 |