Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

build: Remove superfluous MAKE variable for the build suffix

Use BUILDSUF instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information...
commit 13eb9fcf5686142c8b43f6a540d0ea5e40dda651 1 parent d1511c0
James Almer jamrial authored michaelni committed

Showing 2 changed files with 2 additions and 3 deletions. Show diff stats Hide diff stats

  1. +0 1  configure
  2. +2 2 library.mak
1  configure
@@ -4340,7 +4340,6 @@ ifndef FFMPEG_CONFIG_MAK
4340 4340 FFMPEG_CONFIG_MAK=1
4341 4341 FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
4342 4342 prefix=$prefix
4343   -build_suffix=${build_suffix}
4344 4343 LIBDIR=\$(DESTDIR)$libdir
4345 4344 SHLIBDIR=\$(DESTDIR)$shlibdir
4346 4345 INCDIR=\$(DESTDIR)$incdir
4 library.mak
@@ -85,7 +85,7 @@ install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
85 85 $(Q)mkdir -p "$(INCINSTDIR)"
86 86 $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
87 87
88   -install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)${build_suffix}.pc
  88 +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
89 89 $(Q)mkdir -p "$(LIBDIR)/pkgconfig"
90 90 $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
91 91
@@ -99,7 +99,7 @@ uninstall-libs::
99 99
100 100 uninstall-headers::
101 101 $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
102   - $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME)${build_suffix}.pc"
  102 + $(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc"
103 103 -rmdir "$(INCINSTDIR)"
104 104 endef
105 105

0 comments on commit 13eb9fc

Please sign in to comment.
Something went wrong with that request. Please try again.