diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-03 17:13:37 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-03 17:13:37 +0000 |
| commit | 4c3aabe7fa10b00e7b50f6a83978b8b8b93050f7 (patch) | |
| tree | 4d7940c62ec6dba11fc0a4ced26beb506ae111da | |
| parent | 686015abcd50110bbc140a807d4ced21e4fe1d82 (diff) | |
Bug 6638 - Solaris is starting to remind me of RedHat...
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@11715 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | build_tools/make_build_h | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -212,10 +212,12 @@ ifeq ($(OSARCH),Linux) endif GREP=grep +ID=id ifeq ($(OSARCH),SunOS) GREP=/usr/xpg4/bin/grep M4=/usr/local/bin/m4 + ID=/usr/xpg4/bin/id endif INCLUDE+=-Iinclude -I../include @@ -539,7 +541,7 @@ clean: $(MAKE) -C stdtime clean datafiles: all - if [ x`id -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi + if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros for x in sounds/digits/*.gsm; do \ diff --git a/build_tools/make_build_h b/build_tools/make_build_h index a9b041985..167785340 100755 --- a/build_tools/make_build_h +++ b/build_tools/make_build_h @@ -3,7 +3,11 @@ HOSTNAME=`uname -n` KERNEL=`uname -r` MACHINE=`uname -m` OS=`uname -s` -USER=`id -un` +if [ `uname -s` = "SunOS" ]; then + USER=`/usr/xpg4/bin/id -un` +else + USER=`id -un` +fi DATE=`date -u "+%Y-%m-%d %H:%M:%S"` cat << END /* |