[Cvs-nserver-commits] CVS: cvs-nserver/man cvs-server.8,1.1,1.2 .cvsignore,1.1.1.1,1.2 Makefile.am,1
Brought to you by:
tyranny
Menu
▾
▴
[Cvs-nserver-commits] CVS: cvs-nserver/man cvs-server.8,1.1,1.2 .cvsignore,1.1.1.1,1.2 Makefile.am,1.1.1.1,1.2 Makefile.in,1.1.1.6,1.2 cvs.1,1.1.1.4,1.2
|
From: Alexey M. <ty...@us...> - 2003-04-21 20:31:13
|
Update of /cvsroot/cvs-nserver/cvs-nserver/man
In directory sc8-pr-cvs1:/tmp/cvs-serv31333/man
Modified Files:
.cvsignore Makefile.am Makefile.in cvs.1
Added Files:
cvs-server.8
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: .cvsignore
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- .cvsignore 2 Jan 2000 17:12:29 -0000 1.1.1.1
+++ .cvsignore 21 Apr 2003 20:31:06 -0000 1.2
@@ -1 +1,3 @@
Makefile
+cvs-nserver.8
+cvs-pserver.8
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am 19 May 2001 12:05:16 -0000 1.1.1.1
+++ Makefile.am 21 Apr 2003 20:31:06 -0000 1.2
@@ -12,10 +12,18 @@
# 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.1 cvs.5 cvsbug.8 cvs-nserver.8 cvs-pserver.8 cvs-server.8
EXTRA_DIST = \
.cvsignore \
$(man_MANS)
+
+CLEANFILES = cvs-nserver.8 cvs-pserver.8
+
+cvs-nserver.8: cvs-server.8
+ echo .so man8/$^ > $@
+
+cvs-pserver.8: cvs-server.8
+ echo .so man8/$^ > $@
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/Makefile.in,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -d -r1.1.1.6 -r1.2
--- Makefile.in 21 Apr 2003 18:31:10 -0000 1.1.1.6
+++ Makefile.in 21 Apr 2003 20:31:06 -0000 1.2
@@ -1,7 +1,6 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -26,6 +25,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -56,13 +56,9 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
@@ -72,39 +68,44 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
+CPP = @CPP@
CSH = @CSH@
DEPDIR = @DEPDIR@
EDITOR = @EDITOR@
+EXEEXT = @EXEEXT@
+EXPR = @EXPR@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KRB4 = @KRB4@
LN_S = @LN_S@
+M4 = @M4@
+MAINT = @MAINT@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL = @PERL@
PR = @PR@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
ROFF = @ROFF@
-STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
+U = @U@
VERSION = @VERSION@
YACC = @YACC@
am__include = @am__include@
am__quote = @am__quote@
+client_objects = @client_objects@
includeopt = @includeopt@
install_sh = @install_sh@
-man_MANS = cvs.1 cvs.5 cvsbug.8
+man_MANS = cvs.1 cvs.5 cvsbug.8 cvs-nserver.8 cvs-pserver.8 cvs-server.8
EXTRA_DIST = \
.cvsignore \
$(man_MANS)
+
+CLEANFILES = cvs-nserver.8 cvs-pserver.8
subdir = man
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
@@ -117,11 +118,13 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am:
man1dir = $(mandir)/man1
@@ -139,10 +142,6 @@
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; \
@@ -182,10 +181,6 @@
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 5*) ;; \
- *) ext='5' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -225,10 +220,6 @@
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 8*) ;; \
- *) ext='8' ;; \
- esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -255,26 +246,22 @@
tags: TAGS
TAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ @for file in $(DISTFILES); do \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
+ $(mkinstalldirs) "$(distdir)/$$dir"; \
fi; \
if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -pR $$d/$$file $(distdir) \
+ || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
@@ -299,15 +286,15 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -360,6 +347,12 @@
uninstall uninstall-am uninstall-info-am uninstall-man \
uninstall-man1 uninstall-man5 uninstall-man8
+
+cvs-nserver.8: cvs-server.8
+ echo .so man8/$^ > $@
+
+cvs-pserver.8: cvs-server.8
+ echo .so man8/$^ > $@
# for backwards compatibility with the old makefiles
realclean: maintainer-clean
Index: cvs.1
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/man/cvs.1,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -u -d -r1.1.1.4 -r1.2
--- cvs.1 21 Apr 2003 18:23:41 -0000 1.1.1.4
+++ cvs.1 21 Apr 2003 20:31:06 -0000 1.2
@@ -2138,6 +2138,8 @@
.BR co ( 1 ),
.BR cvs ( 5 ),
.BR cvsbug ( 8 ),
+.BR cvs-nserver ( 8 ),
+.BR cvs-pserver ( 8 ),
.BR diff ( 1 ),
.BR grep ( 1 ),
.BR patch ( 1 ),
|
