From 13eb9fcf5686142c8b43f6a540d0ea5e40dda651 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 2 Feb 2013 23:32:56 -0300 Subject: [PATCH] build: Remove superfluous MAKE variable for the build suffix Use BUILDSUF instead. Signed-off-by: James Almer Signed-off-by: Michael Niedermayer --- configure | 1 - library.mak | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 913e3ba25a..1f652465dd 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 362b76ddab..273b3d6e89 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 -- 2.11.0