Merge commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359'

* commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359': build: Add uninstall-pkgconfig target to match install-lib*-pkgconfig Merged-by: James Almer <jamrial@gmail.com>
7 years ago · 6458137200
parent 6bf041a233 fbf77b5ac3
commit 6458137200
2 changed files with 4 additions and 2 deletions
--- a/2
+++ b/2
@ -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)"
--- a/ffbuild/library.mak
+++ b/ffbuild/library.mak
@ -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))