diff options
author | peter <peter@FreeBSD.org> | 2004-06-10 19:05:38 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2004-06-10 19:05:38 +0000 |
commit | 1ca65160a61129882a143f867124863e87679616 (patch) | |
tree | d3d085ec0a7cefbb1c0b360471aa7446b54be77c /contrib/cvs/man | |
parent | 023c667a2ba65987f6b66cda4d0f75b4daf0600d (diff) | |
parent | 8416bda1d23bda4666a5b880a9d78eccaa640036 (diff) | |
download | FreeBSD-src-1ca65160a61129882a143f867124863e87679616.zip FreeBSD-src-1ca65160a61129882a143f867124863e87679616.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r130303,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/cvs/man')
-rw-r--r-- | contrib/cvs/man/ChangeLog | 7 | ||||
-rw-r--r-- | contrib/cvs/man/Makefile.am | 2 | ||||
-rw-r--r-- | contrib/cvs/man/Makefile.in | 61 |
3 files changed, 15 insertions, 55 deletions
diff --git a/contrib/cvs/man/ChangeLog b/contrib/cvs/man/ChangeLog index 650334f..e25c7c1 100644 --- a/contrib/cvs/man/ChangeLog +++ b/contrib/cvs/man/ChangeLog @@ -1,3 +1,10 @@ +2004-04-30 Derek Price <derek@ximbiot.com> + + First pass at closing issue #3 from cvshome.org. + * Makefile.am (man_MANS): Remove cvs.1. + * cvs.1: Removed. + * Makefile.in: Regenerated. + 2004-02-12 Derek Price <derek@ximbiot.com> Close issue #162. diff --git a/contrib/cvs/man/Makefile.am b/contrib/cvs/man/Makefile.am index e881c1e..8846685 100644 --- a/contrib/cvs/man/Makefile.am +++ b/contrib/cvs/man/Makefile.am @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -man_MANS = cvs.1 cvs.5 cvsbug.8 +man_MANS = cvs.5 cvsbug.8 EXTRA_DIST = \ .cvsignore \ $(man_MANS) diff --git a/contrib/cvs/man/Makefile.in b/contrib/cvs/man/Makefile.in index c2433bc..40bf222 100644 --- a/contrib/cvs/man/Makefile.in +++ b/contrib/cvs/man/Makefile.in @@ -140,7 +140,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -man_MANS = cvs.1 cvs.5 cvsbug.8 +man_MANS = cvs.5 cvsbug.8 EXTRA_DIST = \ .cvsignore \ $(man_MANS) @@ -165,53 +165,6 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) uninstall-info-am: -man1dir = $(mandir)/man1 -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done - man5dir = $(mandir)/man5 install-man5: $(man5_MANS) $(man_MANS) @$(NORMAL_INSTALL) @@ -348,7 +301,7 @@ check: check-am all-am: Makefile $(MANS) installdirs: - $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) + $(mkinstalldirs) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -395,7 +348,7 @@ install-exec-am: install-info: install-info-am -install-man: install-man1 install-man5 install-man8 +install-man: install-man5 install-man8 installcheck-am: @@ -417,17 +370,17 @@ ps-am: uninstall-am: uninstall-info-am uninstall-man -uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 +uninstall-man: uninstall-man5 uninstall-man8 .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ - install-man1 install-man5 install-man8 install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-man5 install-man8 install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 + uninstall-man uninstall-man5 uninstall-man8 # for backwards compatibility with the old makefiles |