automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10986 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 0808134b0261a207d4fc17e725f6c51721714078..ece77719f5ecbc349adf8ed7ffdff8a057849aa6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,8 @@ endif
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
 
+PWD=$(shell pwd)
+
 ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
 ######### More GSM codec optimization
 ######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
@@ -212,7 +214,6 @@ ifeq ($(OSARCH),Linux)
   MPG123TARG=linux
 endif
 
-PWD=$(shell pwd)
 GREP=grep
 
 ifeq ($(OSARCH),SunOS)