From 2dc3679b6e589a1e7edd617d6f4efad7433bb969 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Fri, 24 Feb 2006 00:04:40 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10986 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0808134b02..ece77719f5 100644 --- 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)