diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-01-21 01:44:33 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-01-21 01:44:33 +0000 |
| commit | ed8842bea5d4452e5aa011804353f7c04d13f48e (patch) | |
| tree | a4540e48bb7a4a752a33783a0ecfe2d235e780e8 /doc | |
| parent | 9a085abcbd7842aaede9e5aba9587cb9d7f38005 (diff) | |
| download | xine-lib-ed8842bea5d4452e5aa011804353f7c04d13f48e.tar.gz xine-lib-ed8842bea5d4452e5aa011804353f7c04d13f48e.tar.bz2 | |
Use docdir and htmldir as basedir to install the documentation into; these are defined by default by autoconf 2.61, so I've added code to define them when they are missing.
CVS patchset: 8536
CVS date: 2007/01/21 01:44:33
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/faq/Makefile.am | 11 | ||||
| -rw-r--r-- | doc/hackersguide/Makefile.am | 10 |
3 files changed, 11 insertions, 14 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index af97e86b2..0f6e6fb5d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,15 +2,13 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = man hackersguide faq -docs_DATA = README README.dvb README.dxr3 \ +doc_DATA = README README.dvb README.dxr3 \ README.freebsd README.irix README.network_dvd README.opengl \ README.solaris README.syncfb README_xxmc.html README.MINGWCROSS \ README.WIN32 EXTRA_DIST = $(docs_DATA) -docsdir = $(prefix)/share/doc/xine - docs clean-docs: @cd faq && $(MAKE) $@ @cd hackersguide && $(MAKE) $@ diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 3dcbe44e5..6090fd272 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -1,12 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -docs_DATA = faq.html faq.txt +doc_DATA = faq.txt +html_DATA = faq.html -EXTRA_DIST = README faq.sgml $(docs_DATA) +EXTRA_DIST = README faq.sgml $(doc_DATA) $(html_DATA) -docsdir = $(prefix)/share/doc/xine/faq - -docs: $(docs_DATA) +docs: $(doc_DATA) $(html_DATA) distclean-local: clean-docs @@ -16,7 +15,7 @@ docs-prepare: $(srcdir)/faq.sgml fi clean-docs: - rm -f $(docs_DATA) + rm -f $(doc_DATA) $(html_DATA) test "x$(srcdir)" = x. || rm -f faq.sgml dist-hook: diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index 086b7a67a..02a433299 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -12,15 +12,15 @@ hackersguide_fig = architecture.fig \ overlays.fig \ post_frame.fig -docs_DATA = hackersguide.html \ +hackersguide_DATA = hackersguide.html \ architecture.png library.png overlays.png post_frame.png EXTRA_DIST = README $(hackersguide_sgml) $(hackersguide_fig) \ - $(docs_DATA) + $(hackersguide_DATA) -docsdir = $(prefix)/share/doc/xine/hackersguide +hackersguidedir = $(htmldir)/hackersguide -docs: $(docs_DATA) +docs: $(hackersguide_DATA) distclean-local: clean-docs @@ -32,7 +32,7 @@ docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml)) fi clean-docs: - rm -f $(docs_DATA) + rm -f $(hackersguide_DATA) test "x$(srcdir)" = x. || rm -f $(hackersguide_sgml) *.fig dist-hook: |