[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9515 - in gnuradio/branches/developers/jblum/grc_reor
From: |
jblum |
Subject: |
[Commit-gnuradio] r9515 - in gnuradio/branches/developers/jblum/grc_reorganize: . gnuradio-core/doc gr-trellis/doc grc grc/src/platforms/python |
Date: |
Sun, 7 Sep 2008 00:36:30 -0600 (MDT) |
Author: jblum
Date: 2008-09-07 00:36:29 -0600 (Sun, 07 Sep 2008)
New Revision: 9515
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/Makefile.common
gnuradio/branches/developers/jblum/grc_reorganize/gnuradio-core/doc/Makefile.am
gnuradio/branches/developers/jblum/grc_reorganize/gr-trellis/doc/Makefile.am
gnuradio/branches/developers/jblum/grc_reorganize/grc/Makefile.inc
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Makefile.am
Log:
common docs dir
Modified: gnuradio/branches/developers/jblum/grc_reorganize/Makefile.common
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/Makefile.common
2008-09-07 04:13:30 UTC (rev 9514)
+++ gnuradio/branches/developers/jblum/grc_reorganize/Makefile.common
2008-09-07 06:36:29 UTC (rev 9515)
@@ -116,3 +116,6 @@
# Base directory for example applications
exampledir = $(datadir)/gnuradio/examples
+
+# Base directory for documentation
+gr_docdir = $(docdir)-$(VERSION)
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/gnuradio-core/doc/Makefile.am
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/gnuradio-core/doc/Makefile.am
2008-09-07 04:13:30 UTC (rev 9514)
+++
gnuradio/branches/developers/jblum/grc_reorganize/gnuradio-core/doc/Makefile.am
2008-09-07 06:36:29 UTC (rev 9515)
@@ -23,8 +23,6 @@
SUBDIRS = other xml-swig
-docdir = $(prefix)/share/doc/@address@hidden@VERSION@
-
EXTRA_DIST =
all-local: prep @generate_docs@
@@ -39,21 +37,21 @@
mkdir -p xml
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
+ $(mkinstalldirs) $(DESTDIR)$(gr_docdir)
@for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir); \
done
- cp -r html $(DESTDIR)$(docdir)
- cp -r xml $(DESTDIR)$(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; \
+ echo "$(RM) $(DESTDIR)$(gr_docdir)/$$i;"; \
+ $(RM) $(DESTDIR)$(gr_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 xml
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/gr-trellis/doc/Makefile.am
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/gr-trellis/doc/Makefile.am
2008-09-07 04:13:30 UTC (rev 9514)
+++
gnuradio/branches/developers/jblum/grc_reorganize/gr-trellis/doc/Makefile.am
2008-09-07 06:36:29 UTC (rev 9515)
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-docdir=$(prefix)/share/doc/@address@hidden@VERSION@
-
HTML_FILES =
if HAS_XMLTO
@@ -52,18 +50,18 @@
./make_numbered_listing.py $<
install-data-local:
- mkdir -p $(DESTDIR)$(docdir)/html
+ mkdir -p $(DESTDIR)$(gr_docdir)/html
@for i in $(HTML_FILES); do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)/html"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)/html; \
done
uninstall-local:
@for i in $(HTML_FILES); do \
- echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
- $(RM) $(DESTDIR)$(docdir)/$$i; \
+ echo "$(RM) $(DESTDIR)$(gr_docdir)/$$i;"; \
+ $(RM) $(DESTDIR)$(gr_docdir)/$$i; \
done
- $(RM) -fr $(DESTDIR)$(docdir)/html
+ $(RM) -fr $(DESTDIR)$(gr_docdir)/html
clean-local:
$(RM) -fr $(HTML_FILES) *~
Modified: gnuradio/branches/developers/jblum/grc_reorganize/grc/Makefile.inc
===================================================================
--- gnuradio/branches/developers/jblum/grc_reorganize/grc/Makefile.inc
2008-09-07 04:13:30 UTC (rev 9514)
+++ gnuradio/branches/developers/jblum/grc_reorganize/grc/Makefile.inc
2008-09-07 06:36:29 UTC (rev 9515)
@@ -22,8 +22,8 @@
include $(top_srcdir)/Makefile.common
grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
grc_src_prefix = $(pythondir)/gnuradio/grc
-grc_data_prefix = @datadir@/${PACKAGE}/grc
-grc_examples_prefix = @datadir@/${PACKAGE}/examples/grc
+grc_data_prefix = $(datadir)/$(PACKAGE)/grc
+grc_examples_prefix = $(exampledir)/grc
grc_base_data_dir = $(grc_data_prefix)/platforms/base
grc_python_data_dir = $(grc_data_prefix)/platforms/python
grc_python_blocks_dir = $(grc_data_prefix)/platforms/python/blocks
Modified:
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Makefile.am
===================================================================
---
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Makefile.am
2008-09-07 04:13:30 UTC (rev 9514)
+++
gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Makefile.am
2008-09-07 06:36:29 UTC (rev 9515)
@@ -36,8 +36,6 @@
Port.py \
__init__.py
-docdir = $(prefix)/share/doc/@address@hidden@VERSION@
-
BUILT_SOURCES = Constants.py
Constants.py: Makefile $(srcdir)/Constants.py.in
@@ -45,7 +43,7 @@
-e 's|@address@hidden|$(PYTHONW)|g' \
-e 's|@address@hidden|$(grc_python_data_dir)|g' \
-e 's|@address@hidden|$(grc_python_blocks_dir)|g' \
- -e 's|@address@hidden|$(docdir)|g' \
+ -e 's|@address@hidden|$(gr_docdir)|g' \
$(srcdir)/Constants.py.in > $@
EXTRA_DIST = Constants.py.in
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9515 - in gnuradio/branches/developers/jblum/grc_reorganize: . gnuradio-core/doc gr-trellis/doc grc grc/src/platforms/python,
jblum <=