BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uninstall: Remove empty libsigrok/libsigrokcxx include directories. 

Change uninstall-local to uninstall-hook, since the latter is guaranteed
to run last (order is apparently not guaranteed for uninstall-local).

This fixes bug #861.
This commit is contained in:
Uwe Hermann 2017-06-03 18:25:54 +02:00
parent 77463bd397
commit 09b2ca47e6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -601,6 +601,11 @@ INSTALL_EXTRA =
UNINSTALL_EXTRA = UNINSTALL_EXTRA =
CLEAN_EXTRA = CLEAN_EXTRA =
libsigrok-uninstall:
-rmdir $(DESTDIR)$(includedir)/libsigrok
UNINSTALL_EXTRA += libsigrok-uninstall
if BINDINGS_CXX if BINDINGS_CXX
lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
@ -643,6 +648,11 @@ cxx-clean:
CLEAN_EXTRA += cxx-clean CLEAN_EXTRA += cxx-clean
cxx-uninstall:
-rmdir $(DESTDIR)$(includedir)/libsigrokcxx
UNINSTALL_EXTRA += cxx-uninstall
endif endif
CPPXMLDOC = bindings/cxx/doxy/xml/index.xml CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
@ -825,7 +835,7 @@ endif
all-local: $(BUILD_EXTRA) all-local: $(BUILD_EXTRA)
install-exec-local: $(INSTALL_EXTRA) install-exec-local: $(INSTALL_EXTRA)
uninstall-local: $(UNINSTALL_EXTRA) uninstall-hook: $(UNINSTALL_EXTRA)
clean-local: $(CLEAN_EXTRA) clean-local: $(CLEAN_EXTRA)
.PHONY: dist-changelog .PHONY: dist-changelog