From 50464af8c229f75b08fbf9ce043eccdbdec262e5 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Fri, 3 Mar 2006 01:03:41 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11658 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 2 +- build_tools/make_build_h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3b2b7bd4f9..28c76cf942 100644 --- a/Makefile +++ b/Makefile @@ -543,7 +543,7 @@ clean: $(MAKE) -C stdtime clean datafiles: all - if [ x`whoami` = 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/priv-callerintros for x in sounds/digits/*.gsm; do \ diff --git a/build_tools/make_build_h b/build_tools/make_build_h index cd6391a883..a9b0419856 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 /* -- 2.47.2