diff options
| author | Craig Small <csmall@users.sourceforge.net> | 2012-07-28 19:00:56 +1000 |
|---|---|---|
| committer | Craig Small <csmall@users.sourceforge.net> | 2012-07-28 19:00:56 +1000 |
| commit | 2d7933d23257becad992f86c95fc22c7862e7d35 (patch) | |
| tree | b385f04ca0ef5ce5336b0ad26df3474f18382653 /doc | |
| parent | 09362d5554e1c6e523dd02d1a6863242dd0ba6e6 (diff) | |
| parent | 7afa9fa7eb16cc5f53e38bda80e475985a372b6b (diff) | |
Merge branch 'master' of ssh://psmisc.git.sourceforge.net/gitroot/psmisc/psmisc
Conflicts:
doc/killall.1
doc/pstree.1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 0008ad6..541637f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,11 @@ -man_MANS = fuser.1 killall.1 peekfd.1 prtstat.1 pstree.1 +man_MANS = killall.1 peekfd.1 prtstat.1 pstree.1 +EXTRA_MANS = -EXTRA_DIST = $(man_MANS) +if WANT_FUSER + man_MANS += fuser.1 +else + EXTRA_MANS += fuser.1 +endif + +EXTRA_DIST = $(man_MANS) $(EXTRA_MANS) |