summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorjblum2008-09-07 21:38:12 +0000
committerjblum2008-09-07 21:38:12 +0000
commitc86f6c23c6883f73d953d64c28ab42cedb77e4d7 (patch)
tree0193b2a649eb0f7f1065912862de340a02848e16 /gr-trellis
parentddec4fc07744a6519086b1b111f29d551b7f19c6 (diff)
downloadgnuradio-c86f6c23c6883f73d953d64c28ab42cedb77e4d7.tar.gz
gnuradio-c86f6c23c6883f73d953d64c28ab42cedb77e4d7.tar.bz2
gnuradio-c86f6c23c6883f73d953d64c28ab42cedb77e4d7.zip
Merged r9481:9518 on jblum/grc_reorganize into trunk. Reorganized grc source under gnuradio.grc module. Trunk passes make distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9525 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis')
-rw-r--r--gr-trellis/doc/Makefile.am14
1 files changed, 6 insertions, 8 deletions
diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am
index 3bf1ae621..8f6ae2604 100644
--- a/gr-trellis/doc/Makefile.am
+++ b/gr-trellis/doc/Makefile.am
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-docdir=$(prefix)/share/doc/@PACKAGE@-@VERSION@
-
HTML_FILES =
if HAS_XMLTO
@@ -52,18 +50,18 @@ gr-trellis.html : gr-trellis.xml
./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) *~