Merged r10539:10546 from michaelld/two_mods into trunk. Trunk passes distcheck.

[debian/gnuradio] / gnuradio-core / doc / Makefile.am

diff --git a/gnuradio-core/doc/Makefile.am b/gnuradio-core/doc/Makefile.am
index a499946a1bab030c919eaf7a682c36c926a35599..3a67fb6d4cbc881b24aa3cb1cbbeb142ee55d03a 100644 (file)
--- a/gnuradio-core/doc/Makefile.am
+++ b/gnuradio-core/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2005 Free Software Foundation, Inc.
+# Copyright 2001,2005,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,11 +21,11 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = other xml
+SUBDIRS = other xml-swig
 
-docdir  = $(prefix)/share/doc/@PACKAGE@-@VERSION@
-
-EXTRA_DIST = 
+dist_gr_doc_DATA =                     \
+       $(top_srcdir)/README            \
+       $(top_srcdir)/README.hacking
 
 all-local: prep @generate_docs@
 doc: docs            # alias
@@ -35,24 +35,17 @@ html/index.html:
        @DOXYGEN@
 
 prep:
-       mkdir -p html
+       $(MKDIR_P) html
+       $(MKDIR_P) xml
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(docdir)
-       @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
-               echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
-       done
-       cp -r html $(DESTDIR)$(docdir)
-       cp -r xml $(DESTDIR)$(docdir)
+       $(MKDIR_P) $(DESTDIR)$(gr_docdir)
+       cp -r html $(DESTDIR)$(gr_docdir)
+       cp -r xml $(DESTDIR)$(gr_docdir)
 
 uninstall-local:
-       @for i in README README.hacking; do \
-               echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
-               $(RM) $(DESTDIR)$(docdir)/$$i; \
-       done
-       $(RM) -fr $(DESTDIR)$(docdir)/html
-       $(RM) -fr $(DESTDIR)$(docdir)/xml
+       $(RM) -fr $(DESTDIR)$(gr_docdir)/html
+       $(RM) -fr $(DESTDIR)$(gr_docdir)/xml
 
 clean-local:
-       $(RM) -fr latex html man
+       $(RM) -fr latex html man xml