mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
Merged revisions 11634-11635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r11634 | tilghman | 2006-03-02 18:34:52 -0600 (Thu, 02 Mar 2006) | 2 lines Bug 6638 - Change from a historic BSD command to a POSIX command for determining username ........ r11635 | tilghman | 2006-03-02 18:38:14 -0600 (Thu, 02 Mar 2006) | 2 lines Bug 6638 - Use POSIX command for Solaris ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
Makefile
2
Makefile
@@ -554,7 +554,7 @@ clean: clean-depend
|
||||
$(MAKE) -C stdtime clean
|
||||
|
||||
datafiles: all
|
||||
if [ x`whoami` = 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 \
|
||||
|
@@ -3,7 +3,7 @@ HOSTNAME=`uname -n`
|
||||
KERNEL=`uname -r`
|
||||
MACHINE=`uname -m`
|
||||
OS=`uname -s`
|
||||
USER=`whoami`
|
||||
USER=`id -un`
|
||||
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
|
||||
cat << END
|
||||
/*
|
||||
|
Reference in New Issue
Block a user