diff --git a/Makefile b/Makefile
index cce125ce3f..228e8455cb 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
 
 S := $(BUILD_SHARED:yes=S)
-DEP_LIBS := $(foreach L,$(FFLIBS),lib$(L)/$($(S)LIBPREF)$(L)$($(S)LIBSUF))
+DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(S)LIBNAME))
 
 ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
diff --git a/subdir.mak b/subdir.mak
index 5b92f78566..f78d3cbdd3 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -34,7 +34,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 
 ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
-    $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF))
+    $(foreach NAME,$(FFLIBS),lib$(NAME)/$(SLIBNAME))
 endif
 endif