Allow running make in subdirs again.

14 years ago · 95dd1741af
parent 2ec899222b
commit 95dd1741af
2 changed files with 7 additions and 0 deletions
--- a/1
+++ b/1
@ -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)
--- 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)