diff --git a/configure b/configure index 913e3ba25a049b3b826b3e62c3c6b5bdc8a69e2a..1f652465dd949566e9cd7102a38e709c3576aaf7 100755 --- a/configure +++ b/configure @@ -4340,7 +4340,6 @@ ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION prefix=$prefix -build_suffix=${build_suffix} LIBDIR=\$(DESTDIR)$libdir SHLIBDIR=\$(DESTDIR)$shlibdir INCDIR=\$(DESTDIR)$incdir diff --git a/library.mak b/library.mak index 362b76ddab9b188d1144b01fc03433595dab6b8d..273b3d6e89586a0ee2fc15a0fbe5f818202daa4d 100644 --- a/library.mak +++ b/library.mak @@ -85,7 +85,7 @@ install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS)) $(Q)mkdir -p "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" -install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)${build_suffix}.pc +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc $(Q)mkdir -p "$(LIBDIR)/pkgconfig" $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" @@ -99,7 +99,7 @@ uninstall-libs:: uninstall-headers:: $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) - $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME)${build_suffix}.pc" + $(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc" -rmdir "$(INCINSTDIR)" endef