diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-12 00:56:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-12 00:56:25 -0300 |
| commit | 64581372005d57e47ef6580ee2a0e81144f3e5d2 (patch) | |
| tree | 69bd9df59a8ff11bd54b6dffc2864ac6ba1f4545 | |
| parent | 6bf041a2333a240619ba8661af6eccfaeb6c8b1f (diff) | |
| parent | fbf77b5ac37bf2a807d8336450801d7aecf2e359 (diff) | |
| download | ffmpeg-64581372005d57e47ef6580ee2a0e81144f3e5d2.tar.gz | |
Merge commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359'
* commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359':
build: Add uninstall-pkgconfig target to match install-lib*-pkgconfig
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ffbuild/library.mak | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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)" diff --git a/ffbuild/library.mak b/ffbuild/library.mak index f85ee1ebbf..a590a94918 100644 --- 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)) |