Changeset 48

Show
Ignore:
Timestamp:
01/30/04 15:59:07 (8 years ago)
Author:
jimmyo
Message:

Bugfix in install-doc Makefile target (SF#884074).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.21 to 1.22
    r47 r48  
    3131  * More timeouts in munin-update (Deb#222674). 
    3232  * Added max value to generic/vmstat plugin (Deb#225489). 
     33  * Bugfix in install-doc Makefile target (SF#884074). 
    3334 
    3435munin (1.0.0pre1) 

  • trunk/INSTALL

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r6 r48  
    1414 
    1515        - edit Makefile.config 
    16         - make install-doc 
     16        - make install-doc install-man 
    1717 
    1818To install the client: 

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.5 to 1.6
    r9 r48  
    1313default: build 
    1414 
    15 install: install-main install-node install-node-plugins install-doc 
     15install: install-main install-node install-node-plugins install-doc install-man 
    1616 
    1717install-main: build 
    …… 
    8282        #configure plugins. 
    8383 
    84 install-doc: build-doc 
    85         mkdir -p $(DOCDIR) 
     84install-man: build-man 
    8685        mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 
    8786        $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ 
    …… 
    9493        $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ 
    9594        $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ 
    96         $(INSTALL) -m 0644 build/doc/munin-doc.* $(DOCDIR)/ 
    97         $(INSTALL) -m 0644 build/doc/munin-faq.* $(DOCDIR)/ 
     95 
     96install-doc: build-doc 
     97        mkdir -p $(DOCDIR) 
     98        $(INSTALL) -m 0644 build/doc/munin-doc.html $(DOCDIR)/ 
     99        $(INSTALL) -m 0644 build/doc/munin-doc.pdf $(DOCDIR)/ 
     100        $(INSTALL) -m 0644 build/doc/munin-doc.txt $(DOCDIR)/ 
     101        $(INSTALL) -m 0644 build/doc/munin-faq.html $(DOCDIR)/ 
     102        $(INSTALL) -m 0644 build/doc/munin-faq.pdf $(DOCDIR)/ 
     103        $(INSTALL) -m 0644 build/doc/munin-faq.txt $(DOCDIR)/ 
    98104        $(INSTALL) -m 0644 README.* $(DOCDIR)/ 
    99105        $(INSTALL) -m 0644 COPYING $(DOCDIR)/ 
    …… 
    140146        html2text -style pretty -nobs build/doc/munin-faq.html > build/doc/munin-faq.txt 
    141147 
     148        touch build-doc-stamp 
     149 
     150build-man: build-man-stamp 
     151 
     152build-man-stamp: 
    142153        pod2man  --section=8 --release=$(RELEASE) --center="Munin Documentation" \ 
    143154                node/munin-node.in > build/doc/munin-node.8 
    …… 
    161172                node/munin-node.conf.pod > build/doc/munin-node.conf.5 
    162173 
    163         touch build-doc-stamp 
     174        touch build-man-stamp 
    164175 
    165176deb: 
    …… 
    204215        tar -C .. --dereference --exclude CVS --exclude dists -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/ 
    205216 
    206 .PHONY: install install-main install-node install-doc build build-doc deb rpm clean source_dist 
     217.PHONY: install install-main install-node install-doc install-man build build-doc deb rpm clean source_dist 

  • trunk/dists/redhat/lrrd.spec

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2 r48  
    5858        MANDIR=%{buildroot}/%{_mandir} \ 
    5959        DESTDIR=%{buildroot} \ 
    60         install-client install-client-plugins install-doc 
     60        install-client install-client-plugins install-doc install-man 
    6161 
    6262mkdir -p %{buildroot}/etc/init.d