[Commit-gnuradio] r10519 - gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc

[michaelld]

Author: michaelld
Date: 2009-02-25 20:56:22 -0700 (Wed, 25 Feb 2009)
New Revision: 10519

Modified:
   
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
Log:
Changed 'docdir' to 'usrp_docdir' so-as to differentiate it from the
top-level 'docdir' definition.  Moved install and uninstall of the
usrp README file to Automake-generated rules.  Removed uninstall of
'ChangeLog' since it was never installed by these rules.  Moved 'mkdir
-p' to the macro $(MKDIR_P).



Modified: 
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
  2009-02-26 03:53:08 UTC (rev 10518)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
  2009-02-26 03:56:22 UTC (rev 10519)
@@ -25,7 +25,7 @@
 SUBDIRS = other
 
 man3dir = $(mandir)/man3
-docdir  = $(prefix)/share/doc/address@hidden@
+usrp_docdir  = $(prefix)/share/doc/address@hidden@
 
 EXTRA_DIST =                   \
        Doxyfile.in             \
@@ -44,9 +44,11 @@
 all-local: dox
 endif
 
+dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
+
 dox: html/index.html
 html/index.html:
-       mkdir -p html
+       $(MKDIR_P) html
        @DOXYGEN@
 
 docbook-html: usrp_guide.html
@@ -55,25 +57,15 @@
        xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(docdir)
-       @for i in $(top_srcdir)/usrp/README ; do \
-               echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
-       done
-
-       mkdir -p $(DESTDIR)$(docdir)/html
+       $(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
        @for i in $(DOCBOOK_HTML_FILES); do \
-               echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+               echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
        done
-       cp -r html $(DESTDIR)$(docdir)
+       cp -r html $(DESTDIR)$(usrp_docdir)
 
 uninstall-local:
-       @for i in README ChangeLog; do \
-               echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
-               $(RM) $(DESTDIR)$(docdir)/$$i; \
-       done
-       $(RM) -fr $(DESTDIR)$(docdir)/html
+       $(RM) -fr $(DESTDIR)$(usrp_docdir)/html
 
 clean-local:
        $(RM) -fr latex html man xml $(DOCBOOK_HTML_FILES)