From 71f3c9e96fa3f35e05fd8b2d5077eab76f6ad7ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20Krzy=C5=BCanowski?= Date: Thu, 16 Oct 2003 21:09:37 +0000 Subject: [PATCH] - fix doc installation directory - add AC_PROG_LIBTOOL - disable build PS and PDF documentation as it use gtk-doc with HTML documentation. Changed files: gstreamer-doc-destdir.patch -> 1.1 gstreamer-libtool.patch -> 1.1 gstreamer-without_ps_pdf.patch -> 1.1 --- gstreamer-doc-destdir.patch | 36 ++++++++++++++++++++++++++++++++++ gstreamer-libtool.patch | 11 +++++++++++ gstreamer-without_ps_pdf.patch | 13 ++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 gstreamer-doc-destdir.patch create mode 100644 gstreamer-libtool.patch create mode 100644 gstreamer-without_ps_pdf.patch diff --git a/gstreamer-doc-destdir.patch b/gstreamer-doc-destdir.patch new file mode 100644 index 0000000..da93539 --- /dev/null +++ b/gstreamer-doc-destdir.patch @@ -0,0 +1,36 @@ +diff -Nuard gstreamer-0.6.4.orig/docs/faq/Makefile.am gstreamer-0.6.4/docs/faq/Makefile.am +--- gstreamer-0.6.4.orig/docs/faq/Makefile.am 2003-10-09 13:28:44.000000000 +0200 ++++ gstreamer-0.6.4/docs/faq/Makefile.am 2003-10-16 22:41:41.000000000 +0200 +@@ -25,7 +25,7 @@ + EXTRA_DIST = $(SRC) + + # install documentation +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC) ++docdir = $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC) + doc_DATA = $(PDF_DAT) $(PS_DAT) + + include $(srcdir)/../htmlinstall.mak +diff -Nuard gstreamer-0.6.4.orig/docs/manual/Makefile.am gstreamer-0.6.4/docs/manual/Makefile.am +--- gstreamer-0.6.4.orig/docs/manual/Makefile.am 2003-10-08 16:51:45.000000000 +0200 ++++ gstreamer-0.6.4/docs/manual/Makefile.am 2003-10-16 22:42:13.000000000 +0200 +@@ -25,7 +25,7 @@ + EXTRA_DIST = $(SRC) + + # install documentation +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC) ++docdir = $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC) + doc_DATA = $(PDF_DAT) $(PS_DAT) + + include $(srcdir)/../htmlinstall.mak +diff -Nuard gstreamer-0.6.4.orig/docs/pwg/Makefile.am gstreamer-0.6.4/docs/pwg/Makefile.am +--- gstreamer-0.6.4.orig/docs/pwg/Makefile.am 2003-10-09 13:28:44.000000000 +0200 ++++ gstreamer-0.6.4/docs/pwg/Makefile.am 2003-10-16 22:41:54.000000000 +0200 +@@ -25,7 +25,7 @@ + EXTRA_DIST = $(SRC) + + # install documentation +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC) ++docdir = $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC) + doc_DATA = $(PDF_DAT) $(PS_DAT) + + include $(srcdir)/../htmlinstall.mak diff --git a/gstreamer-libtool.patch b/gstreamer-libtool.patch new file mode 100644 index 0000000..70b29d0 --- /dev/null +++ b/gstreamer-libtool.patch @@ -0,0 +1,11 @@ +diff -Nuard gstreamer-0.6.4.orig/configure.ac gstreamer-0.6.4/configure.ac +--- gstreamer-0.6.4.orig/configure.ac 2003-10-13 17:03:13.000000000 +0200 ++++ gstreamer-0.6.4/configure.ac 2003-10-15 20:53:53.000000000 +0200 +@@ -24,6 +24,7 @@ + dnl - interfaces removed -> AGE = 0 + dnl - major/minor got increased -> reset to 0,0,0 + AS_LIBTOOL(GST, 1, 0, 1) ++AC_PROG_LIBTOOL + + AC_CONFIG_SRCDIR([gst/gst.c]) + AM_CONFIG_HEADER(config.h) diff --git a/gstreamer-without_ps_pdf.patch b/gstreamer-without_ps_pdf.patch new file mode 100644 index 0000000..b3be1b8 --- /dev/null +++ b/gstreamer-without_ps_pdf.patch @@ -0,0 +1,13 @@ +diff -Nuard gstreamer-0.6.4.orig/common/m4/gst-doc.m4 gstreamer-0.6.4/common/m4/gst-doc.m4 +--- gstreamer-0.6.4.orig/common/m4/gst-doc.m4 2003-10-10 11:27:14.000000000 +0200 ++++ gstreamer-0.6.4/common/m4/gst-doc.m4 2003-10-16 22:31:32.000000000 +0200 +@@ -149,7 +149,7 @@ + AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes") + AM_CONDITIONAL(BUILD_PLUGIN_DOCS, test "x$BUILD_PLUGIN_DOCS" = "xyes") + AM_CONDITIONAL(DOC_HTML, $DOC_HTML) +-AM_CONDITIONAL(DOC_PDF, $DOC_PDF) +-AM_CONDITIONAL(DOC_PS, $DOC_PS) ++AM_CONDITIONAL(DOC_PDF, false) ++AM_CONDITIONAL(DOC_PS, false) + ]) + -- 2.44.0