| author | James Almer <jamrial@gmail.com> | 2013-02-03 02:32:56 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-03 12:08:36 (GMT) |
| commit | 13eb9fcf5686142c8b43f6a540d0ea5e40dda651 (patch) | |
| tree | 292a71573f0cf54b23560f2c50eed55502bbabd0 | |
| parent | d1511c02f49e2a7faddb727e9b19da8ec6189703 (diff) | |
| download | ffmpeg-13eb9fcf5686142c8b43f6a540d0ea5e40dda651.zip ffmpeg-13eb9fcf5686142c8b43f6a540d0ea5e40dda651.tar.gz ffmpeg-13eb9fcf5686142c8b43f6a540d0ea5e40dda651.tar.bz2 | |
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>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | library.mak | 4 |
2 files changed, 2 insertions, 3 deletions
@@ -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 362b76d..273b3d6 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 |