Fixed $DESTDIR, use it for rpms generation. Update xine.h for audio cap/props.

CVS patchset: 738
CVS date: 2001/10/05 13:41:53

1 files changed, 18 insertions, 17 deletions

diff --git a/doc/xine-lib-API/html/Makefile.am b/doc/xine-lib-API/html/Makefile.am
index 76eef6840..928d0859f 100644
--- a/doc/xine-lib-API/html/Makefile.am
+++ b/doc/xine-lib-API/html/Makefile.am
@@ -1,19 +1,20 @@
 docs_DOCS = \
-	group__mrl__types.html	       structao__driver__t.html \
-	group__status__group.html      structao__functions__t.html                               \
-	annotated.html		       group__ui__callbacks.html    structcfg__data__t.html      \
-	doxygen.css		       group__version__group.html   structconfig__values__s.html \
-	doxygen.gif		       group__video__cap.html	    structconfig__values__t.html \
-	files.html		       group__video__group.html     structmrl__t.html            \
-	functions.html		       group__video__prop.html      structvo__driver__s.html     \
-	globals.html		       group__video__ratio.html     structvo__driver__t.html     \
-	group__autoplay__group.html    group__visual__types.html    structvo__frame__t.html      \
-	group__browse__group.html      group__xine__api.html	    structvo__overlay__t.html    \
-	group__build__info.html	       group__xine__init.html	    structxine__t.html           \
-	group__config__group.html      group__xine__management.html xine_8h-source.html          \
-	group__demux__strategy.html    group__xine__version.html    xine_8h.html                 \
-	group__event__group.html       index.html		    xine_logo.png                \
-	group__loadplugins__group.html modules.html
+	group__demux__strategy.html  modules.html                    group__event__group.html \
+	structao__driver__t.html     group__loadplugins__group.html  structao__functions__t.html \
+	group__mrl__types.html	     structcfg__data__t.html \
+	annotated.html		     group__status__group.html	     structconfig__values__s.html \
+	doxygen.css		     group__ui__callbacks.html	     structconfig__values__t.html \
+	doxygen.gif		     group__version__group.html      structmrl__t.html \
+	files.html		     group__video__cap.html	     structvo__driver__s.html \
+	functions.html		     group__video__group.html	     structvo__driver__t.html \
+	globals.html		     group__video__prop.html	     structvo__frame__t.html \
+	group__audio__cap.html	     group__video__ratio.html	     structvo__overlay__t.html \
+	group__audio__group.html     group__visual__types.html	     structxine__t.html \
+	group__audio__prop.html      group__xine__api.html	     xine_8h-source.html \
+	group__autoplay__group.html  group__xine__init.html	     xine_8h.html \
+	group__browse__group.html    group__xine__management.html    xine_logo.png \
+	group__build__info.html      group__xine__version.html \
+	group__config__group.html    index.html
 
 EXTRA_DIST = $(docs_DOCS)
 
@@ -22,7 +23,7 @@ docdir = $(prefix)/share/doc/xine/xine-lib-API/html
 install-data-local:
 	@documentations='$(docs_DOCS)'; \
 	for doc in $$documentations; do \
-	destdir=$(docdir); \
+	destdir=$(DESTDIR)$(docdir); \
 	name=`echo $$doc` \
 	dir=$$destdir; \
 	$(mkinstalldirs) $$dir; \
@@ -33,7 +34,7 @@ install-data-local:
 uninstall-local:
 	@documentations='$(docs_DOCS)'; \
 	for doc in $$documentations; do \
-	destdir=$(docdir); \
+	destdir=$(DESTDIR)$(docdir); \
 	name=`echo $$doc` \
 	dir=$$destdir; \
 	rm -f $$dir/$$name; \