summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kost <stefkost@src.gnome.org>2007-09-26 19:36:44 +0000
committerStefan Kost <stefkost@src.gnome.org>2007-09-26 19:36:44 +0000
commitfc62f01670769747239c92b64c181e5be7ce0158 (patch)
tree4cfd72a82a5c096af1724982519a71dafe809721
parent671b6cfc964a56cc5c0a72551c7bfe6d1c4e0e00 (diff)
downloadgtk-doc-fc62f01670769747239c92b64c181e5be7ce0158.tar.gz
Handle DESTDIR= case.
* gtk-doc.make: * gtk-doc.notmpl.make: Handle DESTDIR= case. svn path=/trunk/; revision=503
-rw-r--r--ChangeLog6
-rw-r--r--gtk-doc.make7
-rw-r--r--gtk-doc.notmpl.make6
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0aa9eb2..743fe70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
* gtk-doc.make:
* gtk-doc.notmpl.make:
+ Handle DESTDIR= case.
+
+2007-09-26 Stefan Kost <ensonic@users.sf.net>
+
+ * gtk-doc.make:
+ * gtk-doc.notmpl.make:
* gtkdoc-rebase.in:
Fix destdir option name.
diff --git a/gtk-doc.make b/gtk-doc.make
index 70f02f9..590d875 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -140,7 +140,12 @@ install-data-local:
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
fi
- -gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)
+ if test "x$(DESTDIR)" = "x"; then \
+ -gtkdoc-rebase --relative --html-dir=$(TARGET_DIR) \
+ else \
+ -gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)
+ fi
+
uninstall-local:
rm -f $(DESTDIR)$(TARGET_DIR)/*
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index 97a625b..0618378 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -147,6 +147,10 @@ dist-hook: dist-check-gtkdoc dist-hook-local
cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ if test "x$(DESTDIR)" = "x"; then \
+ -gtkdoc-rebase --relative --html-dir=$(TARGET_DIR) \
+ else \
+ -gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)
+ fi
.PHONY : dist-hook-local docs