diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-03 18:04:19 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-03 18:04:19 +0000 |
| commit | 2ea01b7d4a31e0c7c3b9cfb28f9cca1e895ecdf3 (patch) | |
| tree | 3364bc4b351d3054b786068b623f5c64b410baba | |
| parent | 215048a8e1dc2dd263f601bda718d659aae7c3ee (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@11745 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
@@ -215,10 +215,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 @@ -543,7 +545,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 /* |