[asterisk-commits] trunk r11716 - in /trunk: ./ Makefile build_tools/make_build_h

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Fri Mar  3 11:15:51 2006
New Revision: 11716

URL: http://svn.digium.com/view/asterisk?rev=11716&view=rev
Log:
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...

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/make_build_h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=11716&r1=11715&r2=11716&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Mar  3 11:15:51 2006
@@ -225,10 +225,12 @@
 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 @@
 	$(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 \

Modified: trunk/build_tools/make_build_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_build_h?rev=11716&r1=11715&r2=11716&view=diff
==============================================================================
--- trunk/build_tools/make_build_h (original)
+++ trunk/build_tools/make_build_h Fri Mar  3 11:15:51 2006
@@ -3,7 +3,11 @@
 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
 /*