mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 14:58:25 +00:00
automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
Makefile
2
Makefile
@@ -543,7 +543,7 @@ clean:
|
|||||||
$(MAKE) -C stdtime clean
|
$(MAKE) -C stdtime clean
|
||||||
|
|
||||||
datafiles: all
|
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/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 \
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ HOSTNAME=`uname -n`
|
|||||||
KERNEL=`uname -r`
|
KERNEL=`uname -r`
|
||||||
MACHINE=`uname -m`
|
MACHINE=`uname -m`
|
||||||
OS=`uname -s`
|
OS=`uname -s`
|
||||||
USER=`whoami`
|
USER=`id -un`
|
||||||
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
|
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
|
||||||
cat << END
|
cat << END
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user