dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@11716 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2006-03-03 17:15:51 +00:00
parent fc4d05ac2b
commit fb3a3671fc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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 \

6
build_tools/make_build_h
View File

@ -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
/*