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

[Karl Heyes]

karl        04/01/13 15:27:11

  Modified:    conf     Makefile.am
               doc      Makefile.am
  Log:
  allow pkgdatadir to overide where docs are placed.

Revision  Changes    Path
1.4       +1 -10     ices/conf/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/conf/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	9 Jan 2004 23:48:42 -0000	1.3
+++ Makefile.am	13 Jan 2004 20:27:10 -0000	1.4
@@ -2,14 +2,5 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-doc_DATA = ices-live.xml ices-playlist.xml
-
-EXTRA_DIST = $(doc_DATA)
-
-debug:
-	$(MAKE) all CFLAGS="@DEBUG@"
-
-profile:
-	$(MAKE) all CFLAGS="@PROFILE@"
+dist_pkgdata_DATA = ices-live.xml ices-playlist.xml
 

<p><p>1.2       +1 -4      ices/doc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ices/doc/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	29 Dec 2003 23:49:25 -0000	1.1
+++ Makefile.am	13 Jan 2004 20:27:10 -0000	1.2
@@ -2,7 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-doc_DATA = basic.html config.html faq.html index.html inputs.html intro.html style.css
-
-EXTRA_DIST = $(doc_DATA)
+dist_pkgdata_DATA = basic.html config.html faq.html index.html inputs.html intro.html style.css

<p><p>--- >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.