diff options
| author | jcorgan | 2009-02-26 23:39:17 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-26 23:39:17 +0000 |
| commit | 503efe1fbe3822979b8aa3c868d3d13fbeb9af7f (patch) | |
| tree | a3312f065b8865c473d2151f70a8d6ee1992563d /gnuradio-core | |
| parent | f1c079534256ec7e1cd2bbf1360bec15c539d87c (diff) | |
| download | gnuradio-503efe1fbe3822979b8aa3c868d3d13fbeb9af7f.tar.gz gnuradio-503efe1fbe3822979b8aa3c868d3d13fbeb9af7f.tar.bz2 gnuradio-503efe1fbe3822979b8aa3c868d3d13fbeb9af7f.zip | |
Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/Makefile.am | 3 | ||||
| -rw-r--r-- | gnuradio-core/doc/Makefile.am | 19 |
2 files changed, 5 insertions, 17 deletions
diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am index 91537dfa4..e05a3f75b 100644 --- a/gnuradio-core/Makefile.am +++ b/gnuradio-core/Makefile.am @@ -22,7 +22,6 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = \ - gnuradio-core.conf \ gnuradio-core.pc.in SUBDIRS = src doc @@ -31,4 +30,4 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnuradio-core.pc etcdir = $(sysconfdir)/gnuradio/conf.d -etc_DATA = gnuradio-core.conf +dist_etc_DATA = gnuradio-core.conf diff --git a/gnuradio-core/doc/Makefile.am b/gnuradio-core/doc/Makefile.am index 1f5bef2ce..5bbd3c0cc 100644 --- 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 # @@ -23,8 +23,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = other xml-swig -EXTRA_DIST = - all-local: prep @generate_docs@ doc: docs # alias @@ -33,26 +31,17 @@ html/index.html: @DOXYGEN@ prep: - mkdir -p html - mkdir -p xml + $(MKDIR_P) html + $(MKDIR_P) xml install-data-local: - $(mkinstalldirs) $(DESTDIR)$(gr_docdir) - @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \ - echo "$(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir); \ - done + $(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)$(gr_docdir)/$$i;"; \ - $(RM) $(DESTDIR)$(gr_docdir)/$$i; \ - done $(RM) -fr $(DESTDIR)$(gr_docdir)/html $(RM) -fr $(DESTDIR)$(gr_docdir)/xml clean-local: $(RM) -fr latex html man xml - |