From 7943699850b73f4e70871cc08149d15e26f2f2a8 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 14 Dec 2003 22:27:25 +0000 Subject: [PATCH] uninstall fixes Original commit message from CVS: uninstall fixes --- common | 2 +- docs/gst/Makefile.am | 2 +- docs/htmlinstall.mak | 2 +- docs/libs/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common b/common index fcdc6cc..9f37b3e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit fcdc6ccbcc674dd487021d87a0313abf02bae396 +Subproject commit 9f37b3e515260c7b294222a502b2cc75dd0983b6 diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index b631a84..3fd4954 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -258,7 +258,7 @@ uninstall-local: echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \ rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \ fi) - rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR) + if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR); fi else install-data-local: uninstall-local: diff --git a/docs/htmlinstall.mak b/docs/htmlinstall.mak index 6ceff19..a3765fd 100644 --- a/docs/htmlinstall.mak +++ b/docs/htmlinstall.mak @@ -9,7 +9,7 @@ install-data-local: html uninstall-local: for part in $(HTML_DAT); do rm -rf $(DESTDIR)$(docdir)/$$part; done - rmdir $(DESTDIR)$(docdir) + if test -d $(DESTDIR)$(docdir); then rmdir $(DESTDIR)$(docdir); fi else install-data-local: uninstall-local: diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index e2101b6..f3ef7f7 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -257,7 +257,7 @@ uninstall-local: echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \ rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \ fi) - rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR) + if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR); fi else install-data-local: uninstall-local: -- 2.7.4