gtk-doc/: Simplily uninstall rule. Its closer to upstream and fixes #150331.

Original commit message from CVS:
* gtk-doc-plugins.mak:
* gtk-doc.mak:
Simplily uninstall rule. Its closer to upstream and fixes #150331.

diff --git a/ChangeLog b/ChangeLog
index 27dafaf690be9b42edf2808097f7271fb616165f..51415f15a63a08a01b7e0c2f83ed31e5b9714ddc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-01  Stefan Kost  <ensonic@users.sf.net>
+
+       * gtk-doc-plugins.mak:
+       * gtk-doc.mak:
+         Simplily uninstall rule. Its closer to upstream and fixes #150331.
+
 2008-11-29  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * m4/glib-gettext.m4:

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index f673a7fb1d425d99351a15bc575cdb575e33d761..59fcb73dc23a5982168fcb5c8b37bc9a65656b78 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -302,36 +302,12 @@ install-data-local:
            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
        fi) 
 uninstall-local:
-       (installfiles=`echo ./html/*.html`; \
-       if test "$$installfiles" = './html/*.html'; \
-       then echo '-- Nothing to uninstall' ; \
+       if test -d $(DESTDIR)$(TARGET_DIR); then \
+         rm -rf $(DESTDIR)$(TARGET_DIR)/*; \
+         rmdir -p $(DESTDIR)$(TARGET_DIR) 2>/dev/null || true; \
        else \
-         for i in $$installfiles; do \
-           rmfile=`basename $$i` ; \
-           echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
-           rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
-         done; \
-         pngfiles=`echo ./html/*.png`; \
-         if test "$$pngfiles" != './html/*.png'; then \
-           for i in $$pngfiles; do \
-             rmfile=`basename $$i` ; \
-             echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
-             rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
-           done; \
-         fi; \
-         echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
-         rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
-         if test -e $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
-           rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
-         fi; \
-         echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
-         rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
-               if test -e $(DESTDIR)$(TARGET_DIR)/style.css; then \
-                       echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/style.css' ; \
-                       rm -f $(DESTDIR)$(TARGET_DIR)/style.css; \
-               fi; \
-       fi) 
-       if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR) 2>/dev/null; fi; true
+         echo '-- Nothing to uninstall' ; \
+       fi;
 
 #
 # Checks

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 51fb176967df74ef5c4b0571ee35c8cf3e13fb4f..7cb22796a09b2a3a25ed37580e0058fccc18c9b4 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -206,36 +206,13 @@ install-data-local:
            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
        fi) 
 uninstall-local:
-       (installfiles=`echo ./html/*.html`; \
-       if test "$$installfiles" = './html/*.html'; \
-       then echo '-- Nothing to uninstall' ; \
+       if test -d $(DESTDIR)$(TARGET_DIR); then \
+         rm -rf $(DESTDIR)$(TARGET_DIR)/*; \
+         rmdir -p $(DESTDIR)$(TARGET_DIR) 2>/dev/null || true; \
        else \
-         for i in $$installfiles; do \
-           rmfile=`basename $$i` ; \
-           echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
-           rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
-         done; \
-         pngfiles=`echo ./html/*.png`; \
-         if test "$$pngfiles" != './html/*.png'; then \
-           for i in $$pngfiles; do \
-             rmfile=`basename $$i` ; \
-             echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/'$$rmfile ; \
-             rm -f $(DESTDIR)$(TARGET_DIR)/$$rmfile; \
-           done; \
-         fi; \
-         echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE).devhelp' ; \
-         rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
-         if test -e $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \
-           rm -f $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
-         fi; \
-         echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/index.sgml' ; \
-         rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
-               if test -e $(DESTDIR)$(TARGET_DIR)/style.css; then \
-                       echo '-- Uninstalling $(DESTDIR)$(TARGET_DIR)/style.css' ; \
-                       rm -f $(DESTDIR)$(TARGET_DIR)/style.css; \
-               fi; \
-       fi) 
-       if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR) 2>/dev/null; fi; true
+         echo '-- Nothing to uninstall' ; \
+       fi;
+
 
 #
 # Require gtk-doc when making dist