[xiph-cvs] cvs commit: vorbis/doc/vorbisfile Makefile.am

[Jack Moffitt]

jack        00/11/08 01:48:59

  Modified:    .        Makefile.am libvorbis.spec
               doc      Makefile.am
               doc/vorbisenc Makefile.am
               doc/vorbisfile Makefile.am
  Log:
  this took me hours to get right.
  
  it's' still not right on redhat versiosn < 7.0 since they moved teh doc dir from /usr/doc to /usr/share/doc.  not quite sure what to do about that :)
  
  jack.

Revision  Changes    Path
1.4       +1 -1      vorbis/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2000/11/06 00:06:45	1.3
+++ Makefile.am	2000/11/08 09:48:57	1.4
@@ -7,7 +7,7 @@
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
 
-EXTRA_DIST = README COPYING todo.txt libvorbis.spec vorbis.m4
+EXTRA_DIST = README AUTHORS COPYING libvorbis.spec vorbis.m4
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

1.5       +8 -5      vorbis/libvorbis.spec

Index: libvorbis.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis/libvorbis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libvorbis.spec	2000/11/08 08:36:35	1.4
+++ libvorbis.spec	2000/11/08 09:48:57	1.5
@@ -12,7 +12,7 @@
 Vendor:		Xiphophorus <team at xiph.org>
 Source:		ftp://ftp.xiph.org/pub/ogg/vorbis/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-root
-Requires:	libogg >= 1.0.0
+Requires:	libogg >= 1.0beta3
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
@@ -22,7 +22,7 @@
 %package devel
 Summary: 	Vorbis Library Development
 Group: 		Development/Libraries
-Requires:	libogg-devel >= 1.0.0
+Requires:	libogg-devel >= 1.0beta3
 Requires:	libvorbis-devel = %{version}
 
 %description devel
@@ -47,6 +47,7 @@
 %files
 %defattr(-,root,root)
 %doc COPYING
+%doc AUTHORS
 %doc README
 /usr/lib/libvorbis.so.*
 /usr/lib/libvorbisfile.so.*
@@ -54,10 +55,12 @@
 
 %files devel
 %doc doc/*.html
-%doc doc/*.txt
 %doc doc/*.png
-%doc doc/vorbisfile/*.html
-%doc doc/vorbisfile/*.css
+%doc doc/*.txt
+%{_docdir}/%{name}-%{version}/vorbisfile/*.html
+%{_docdir}/%{name}-%{version}/vorbisfile/*.css
+%{_docdir}/%{name}-%{version}/vorbisenc/*.html
+%{_docdir}/%{name}-%{version}/vorbisenc/*.css
 /usr/include/vorbis/codec.h
 /usr/include/vorbis/vorbisfile.h
 /usr/include/vorbis/vorbisenc.h

1.6       +2 -1      vorbis/doc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	2000/11/08 00:22:35	1.5
+++ Makefile.am	2000/11/08 09:48:58	1.6
@@ -7,6 +7,7 @@
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 
 doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html\
-	 vorbis.html wait.png white-xifish.png
+	vorbis.html wait.png white-xifish.png vorbis-clip.txt\
+	vorbis-errors.txt
 
 EXTRA_DIST = $(doc_DATA)

1.2       +1 -1      vorbis/doc/vorbisenc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/vorbisenc/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2000/11/08 00:26:02	1.1
+++ Makefile.am	2000/11/08 09:48:58	1.2
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
 
 doc_DATA = index.html overview.html reference.html style.css\
          vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html

1.3       +1 -1      vorbis/doc/vorbisfile/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/vorbisfile/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2000/11/06 00:06:47	1.2
+++ Makefile.am	2000/11/08 09:48:58	1.3
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
 
 doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html\
         datastructures.html decoding.html example.html exampleindex.html\

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.