@@ -1,3 +1,4 @@

+MAIN_MAKEFILE=1

 include config.mak

 vpath %.c    $(SRC_PATH)

@@ -39,7 +40,6 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)

 SKIPHEADERS = cmdutils_common_opts.h

-MAIN_MAKEFILE=1

 include $(SRC_PATH)/common.mak

 FF_LDFLAGS   := $(FFLDFLAGS)

@@ -7,12 +7,6 @@ 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)

@@ -3297,6 +3297,9 @@ BINDIR=\$(DESTDIR)$bindir

 DATADIR=\$(DESTDIR)$datadir

 MANDIR=\$(DESTDIR)$mandir

 SRC_PATH=$source_path

+ifndef MAIN_MAKEFILE

+SRC_PATH:=\$(SRC_PATH:.%=..%)

+endif

 CC_IDENT=$cc_ident

 ARCH=$arch

 CC=$cc