automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11745 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 28c76cf942c2c31f7142f7557f5475577dd8d808..a238a971a0fd3779ba3f018fcbf55c8c66731e35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 a9b04198564c9009d61ad5c8af2d88d42044cca9..167785340e9c8ac4b0e7b168356f8c127469a9e4 100755 (executable)
--- 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
 /*