gtk-doc: more srcdir<->builddir fixes

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 51f7a82..0fad6dd 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -252,8 +252,8 @@ MAINTAINERCLEANFILES = $(MAINTAINER_DOC_STAMPS)
 
 # thomas: make docs parallel installable; devhelp requires majorminor too
 install-data-local:
-       (installfiles=`echo $(srcdir)/html/*.sgml $(srcdir)/html/*.html $(srcdir)/html/*.png $(srcdir)/html/*.css`; \
-       if test "$$installfiles" = '$(srcdir)/html/*.sgml $(srcdir)/html/*.html $(srcdir)/html/*.png $(srcdir)/html/*.css'; \
+       (installfiles=`echo $(builddir)/html/*.sgml $(builddir)/html/*.html $(builddir)/html/*.png $(builddir)/html/*.css`; \
+       if test "$$installfiles" = '$(builddir)/html/*.sgml $(builddir)/html/*.html $(builddir)/html/*.png $(builddir)/html/*.css'; \
        then echo '-- Nothing to install' ; \
        else \
          $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
@@ -268,11 +268,11 @@ install-data-local:
              $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
            done; \
          fi; \
-         echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
-         $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+         echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp' ; \
+         $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp \
            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
-         if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
-                   $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+         if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
+                   $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
                    $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
          fi; \
          (which gtkdoc-rebase >/dev/null && \

diff --git a/gtk-doc.mak b/gtk-doc.mak
index cff22da..91edeee 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -190,11 +190,11 @@ install-data-local:
            echo '-- Installing '$$i ; \
            $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
          done; \
-         echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
-         $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+         echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp' ; \
+         $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp \
            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
-         if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
-                   $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+         if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \
+                   $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \
                    $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
          fi; \
          (which gtkdoc-rebase >/dev/null && \