[Commit-gnuradio] r10527 - in gnuradio/branches/developers/michaelld/fix_local_data_install: gnuradio-core/doc gnuradio-examples/python/mp-sched usrp/doc

[michaelld]

Author: michaelld
Date: 2009-02-26 07:49:28 -0700 (Thu, 26 Feb 2009)
New Revision: 10527

Modified:
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
Log:
Use "mkdir_p", not "MKDIR_P".  Make sure to create a parent directory
before copying into it.  Scripts should be both installed as well as
distributed.  Works (make, make check, make distcheck on latest OSX
and Ubuntu) without --enable-doxygen for documentation; next step is
testing with that flag.



Modified: 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
 2009-02-26 08:22:47 UTC (rev 10526)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
 2009-02-26 14:49:28 UTC (rev 10527)
@@ -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
 # 
@@ -31,10 +31,11 @@
        @DOXYGEN@
 
 prep:
-       mkdir -p html
-       mkdir -p xml
+       $(mkdir_p) html
+       $(mkdir_p) xml
 
 install-data-local:
+       $(mkdir_p) $(DESTDIR)$(gr_docdir)
        cp -r html $(DESTDIR)$(gr_docdir)
        cp -r xml $(DESTDIR)$(gr_docdir)
 

Modified: 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
 2009-02-26 08:22:47 UTC (rev 10526)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
 2009-02-26 14:49:28 UTC (rev 10527)
@@ -22,7 +22,7 @@
 
 ourdatadir = $(exampledir)/mp-sched
 
-ourdata_SCRIPTS =              \
+dist_ourdata_SCRIPTS =         \
        plot_flops.py           \
        run_synthetic.py        \
        synthetic.py            \

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 08:22:47 UTC (rev 10526)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
  2009-02-26 14:49:28 UTC (rev 10527)
@@ -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
 # 
@@ -48,7 +48,7 @@
 
 dox: html/index.html
 html/index.html:
-       $(MKDIR_P) html
+       $(mkdir_p) html
        @DOXYGEN@
 
 docbook-html: usrp_guide.html
@@ -57,7 +57,7 @@
        xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
 
 install-data-local:
-       $(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
+       $(mkdir_p) $(DESTDIR)$(usrp_docdir)/html
        @for i in $(DOCBOOK_HTML_FILES); do \
                echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \