diff options
| author | fergus.henderson <fergushenderson@users.noreply.github.com> | 2008-05-30 07:46:49 +0000 |
|---|---|---|
| committer | fergus.henderson <fergushenderson@users.noreply.github.com> | 2008-05-30 07:46:49 +0000 |
| commit | 4f0a258bc5f243ef50282562482c0fdf90c31c91 (patch) | |
| tree | b4dc48e09ecfe90d4f378e040ca46071af8cf400 | |
| parent | 9d7751be13dfc4a7c31478102fdbd4e301337881 (diff) | |
| download | distcc-git-4f0a258bc5f243ef50282562482c0fdf90c31c91.tar.gz | |
Fix a bug where the "pump" man page was not included in the RPM
and Debian packages.
Also, fix a bug where the Makefile rules for building HTML files were
not working when srcdir != builddir.
Tested by "make install-deb; man pump".
Reviewers: Craig Silverstein
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | packaging/RedHat/rpm.spec | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index aee46da..c81f051 100644 --- a/Makefile.in +++ b/Makefile.in @@ -360,8 +360,9 @@ conf_files = $(conf_dir)/hosts \ default_dir = packaging/RedHat/default default_files = $(default_dir)/distcc -man1_MEN = man/distcc.1 man/distccd.1 man/distccmon-text.1 -man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html +man1_MEN = man/distcc.1 man/distccd.1 man/distccmon-text.1 man/pump.1 +man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ + man/pump_1.html MEN = $(man1_MEN) gnome_data = gnome/distccmon-gnome-icon.png \ @@ -636,13 +637,16 @@ dist-files: $(dist_files) ## BUILD manual targets man/distcc_1.html: man/distcc.1 - troff2html -man man/distcc.1 > $@ + troff2html -man "$(srcdir)"/man/distcc.1 > $@ man/distccd_1.html: man/distccd.1 - troff2html -man man/distccd.1 > $@ + troff2html -man "$(srcdir)"/man/distccd.1 > $@ man/distccmon_text_1.html: man/distccmon-text.1 - troff2html -man man/distccmon-text.1 > $@ + troff2html -man "$(srcdir)"/man/distccmon-text.1 > $@ + +man/pump_1.html: man/pump.1 + troff2html -man "$(srcdir)"/man/pump.1 > $@ ###################################################################### diff --git a/packaging/RedHat/rpm.spec b/packaging/RedHat/rpm.spec index ef6ad99..457a232 100644 --- a/packaging/RedHat/rpm.spec +++ b/packaging/RedHat/rpm.spec @@ -81,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/distcc/hosts %doc %{_mandir}/man1/distcc.1.gz %doc %{_mandir}/man1/distccmon-text.1.gz +%doc %{_mandir}/man1/pump.1.gz %doc %{_docdir} |