]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:56:25 +0000 (00:56 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:56:25 +0000 (00:56 -0300)
* commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359':
  build: Add uninstall-pkgconfig target to match install-lib*-pkgconfig

Merged-by: James Almer <jamrial@gmail.com>
1  2 
Makefile
ffbuild/library.mak

diff --cc Makefile
Simple merge
index f85ee1ebbfada852b85d9db8fd298921139392e6,a4b57e8824a72014501d6659e4ecb75df5f0707f..a590a94918fd4d280095e319aee7cbc844f9b77d
@@@ -97,8 -92,10 +97,10 @@@ uninstall-libs:
  
  uninstall-headers::
        $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
-       $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"
        -rmdir "$(INCINSTDIR)"
 -      $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
+ uninstall-pkgconfig::
++      $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"
  endef
  
  $(eval $(RULES))