[Cvs-nserver-commits] CVS: cvs-nserver/contrib repcheck,1.1,1.2 Makefile.am,1.1.1.3,1.2 Makefile.in,
Brought to you by:
tyranny
Menu
▾
▴
[Cvs-nserver-commits] CVS: cvs-nserver/contrib repcheck,1.1,1.2 Makefile.am,1.1.1.3,1.2 Makefile.in,1.1.1.6,1.2 cvscheck.sh,1.1.1.1,1.2
|
From: Alexey M. <ty...@us...> - 2003-04-22 18:57:03
|
Update of /cvsroot/cvs-nserver/cvs-nserver/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/contrib
Modified Files:
Makefile.am Makefile.in cvscheck.sh
Added Files:
repcheck
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5
Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/Makefile.am,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- Makefile.am 21 Apr 2003 18:30:52 -0000 1.1.1.3
+++ Makefile.am 22 Apr 2003 18:56:56 -0000 1.2
@@ -21,7 +21,6 @@
cln_hist \
commit_prep \
cvs2vendor \
- cvs_acls \
cvscheck \
debug_check_log \
log \
@@ -62,8 +61,6 @@
# we'd rather have a link here rather than two copies of a script
install-data-local:
- : FIXME - this path should be determined dynamically from bindir
- : and contribdir
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_LINKS)'; for p in $$list; do \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/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:30:52 -0000 1.1.1.6
+++ Makefile.in 22 Apr 2003 18:56:57 -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,
@@ -27,6 +26,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@
@@ -57,13 +57,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@
@@ -73,31 +69,34 @@
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@
@@ -109,7 +108,6 @@
cln_hist \
commit_prep \
cvs2vendor \
- cvs_acls \
cvscheck \
debug_check_log \
log \
@@ -171,63 +169,65 @@
.SUFFIXES:
.SUFFIXES: .sh
-$(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 contrib/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
check_cvs: $(top_builddir)/config.status check_cvs.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
clmerge: $(top_builddir)/config.status clmerge.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
cln_hist: $(top_builddir)/config.status cln_hist.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
commit_prep: $(top_builddir)/config.status commit_prep.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
cvs_acls: $(top_builddir)/config.status cvs_acls.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
log: $(top_builddir)/config.status log.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
log_accum: $(top_builddir)/config.status log_accum.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
mfpipe: $(top_builddir)/config.status mfpipe.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
pvcs2rcs: $(top_builddir)/config.status pvcs2rcs.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
rcslock: $(top_builddir)/config.status rcslock.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
sccs2rcs: $(top_builddir)/config.status sccs2rcs.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-contribSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
install-contribSCRIPTS: $(contrib_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(contribdir)
@list='$(contrib_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(contribSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f"; \
- $(contribSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f; \
+ f="`echo $$p|sed '$(transform)'`"; \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(contribdir)/$$f"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(contribdir)/$$f; \
+ elif test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$f"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$f; \
else :; fi; \
done
uninstall-contribSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(contrib_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ f="`echo $$p|sed '$(transform)'`"; \
echo " rm -f $(DESTDIR)$(contribdir)/$$f"; \
rm -f $(DESTDIR)$(contribdir)/$$f; \
done
uninstall-info-am:
-contribDATA_INSTALL = $(INSTALL_DATA)
install-contribDATA: $(contrib_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(contribdir)
@list='$(contrib_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(contribDATA_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f"; \
- $(contribDATA_INSTALL) $$d$$p $(DESTDIR)$(contribdir)/$$f; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(contribdir)/$$f"; \
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(contribdir)/$$f; \
done
uninstall-contribDATA:
@@ -240,26 +240,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 \
@@ -284,7 +280,6 @@
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:
@@ -293,7 +288,7 @@
-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"
@@ -350,8 +345,6 @@
# we'd rather have a link here rather than two copies of a script
install-data-local:
- : FIXME - this path should be determined dynamically from bindir
- : and contribdir
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_LINKS)'; for p in $$list; do \
Index: cvscheck.sh
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/contrib/cvscheck.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cvscheck.sh 2 Jan 2000 17:12:29 -0000 1.1.1.1
+++ cvscheck.sh 22 Apr 2003 18:56:57 -0000 1.2
@@ -43,7 +43,7 @@
fi
# Else if a directory
- elif [ -d $file -a $file != CVS.adm ] ; then
+ elif [ -d $file -a $file != CVS ] ; then
# Move into it
cd $file
|