diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-03 00:41:19 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-03 00:41:19 +0000 |
| commit | 99fec5cea56534147bb1aecc66eb394544a0f8e1 (patch) | |
| tree | b8a1b999810f2e20bba24de064fc69f00b31106a | |
| parent | e392677569438f029879307eb6e4057f892a3b72 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@11636 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | build_tools/make_build_h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 \ diff --git a/build_tools/make_build_h b/build_tools/make_build_h index cd6391a88..a9b041985 100755 --- a/build_tools/make_build_h +++ b/build_tools/make_build_h @@ -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 /* |