From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 3 Mar 2006 17:15:51 +0000 (+0000)
Subject: Merged revisions 11715 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2494
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21a8d15be492ee5b18afd99a820a8ccfbf3c1067;p=thirdparty%2Fasterisk.git

Merged revisions 11715 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r11715 | tilghman | 2006-03-03 11:13:37 -0600 (Fri, 03 Mar 2006) | 2 lines

Bug 6638 - Solaris is starting to remind me of RedHat...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 6037dea8b2..0b3d88194b 100644
--- a/Makefile
+++ b/Makefile
@@ -225,10 +225,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
@@ -554,7 +556,7 @@ clean: clean-depend
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	if [ x`id -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ x`$(ID) -un` = xroot ]; then sh build_tools/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 a9b0419856..167785340e 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
 /*