Skip to content

Commit

Permalink
Merge commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359'
Browse files Browse the repository at this point in the history
* commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359':
  build: Add uninstall-pkgconfig target to match install-lib*-pkgconfig

Merged-by: James Almer <[email protected]>
  • Loading branch information
jamrial committed Nov 12, 2017
2 parents 6bf041a + fbf77b5 commit 6458137
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
4 changes: 3 additions & 1 deletion ffbuild/library.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 6458137

Please sign in to comment.