kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 03:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-03 18:04:19 +00:00
parent d848cb43b3
commit c19212f8d0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -215,10 +215,12 @@ ifeq ($(OSARCH),Linux)
endif endif
GREP=grep GREP=grep
ID=id
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
GREP=/usr/xpg4/bin/grep GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4 M4=/usr/local/bin/m4
ID=/usr/xpg4/bin/id
endif endif
INCLUDE+=-Iinclude -I../include INCLUDE+=-Iinclude -I../include
@@ -543,7 +545,7 @@ clean:
$(MAKE) -C stdtime clean $(MAKE) -C stdtime clean
datafiles: all 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/digits
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \ 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` KERNEL=`uname -r`
MACHINE=`uname -m` MACHINE=`uname -m`
OS=`uname -s` 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"` DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
cat << END cat << END
/* /*