[FFmpeg-cvslog] Allow running make in subdirs again.

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Jun 24 09:10:25 2011 +0200| [95dd1741af2c0416b74135f6ccf40f4bab5583b6] | committer: Reimar Döffinger

Allow running make in subdirs again.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95dd1741af2c0416b74135f6ccf40f4bab5583b6
---

 Makefile   |    1 +
 common.mak |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index d3a56de..966afc6 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
 
 SKIPHEADERS = cmdutils_common_opts.h
 
+MAIN_MAKEFILE=1
 include common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)
diff --git a/common.mak b/common.mak
index 8d21d15..7c03e48 100644
--- a/common.mak
+++ b/common.mak
@@ -7,6 +7,12 @@ all: all-yes
 
 ifndef SUBDIR
 
+ifndef MAIN_MAKEFILE
+ifeq ($(SRC_PATH),.)
+SRC_PATH = ..
+endif
+endif
+
 ifndef V
 Q      = @
 ECHO   = printf "$(1)\t%s\n" $(2)