summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--common.mak6
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d3a56de712..966afc636b 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 8d21d154d5..7c03e48091 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)