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>
Makefile
ffbuild/library.mak

index e088e30..402f8b2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ install-data: $(DATA_FILES)
        $(Q)mkdir -p "$(DATADIR)"
        $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 
-uninstall: uninstall-libs uninstall-headers uninstall-data
+uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
 
 uninstall-data:
        $(RM) -r "$(DATADIR)"
index f85ee1e..a590a94 100644 (file)
@@ -97,8 +97,10 @@ uninstall-libs::
 
 uninstall-headers::
        $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
-       $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"
        -rmdir "$(INCINSTDIR)"
+
+uninstall-pkgconfig::
+       $(RM) "$(PKGCONFIGDIR)/lib$(FULLNAME).pc"
 endef
 
 $(eval $(RULES))