Put files in /usr/libexec/cvs and /usr/libdata/cvs; suggestion from Todd

Miller <todd.miller@courtesan.com>

4 files changed, 23 insertions, 15 deletions

diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index 3cffb4d681b..f129526597f 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.31 1999/06/07 00:45:36 deraadt Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.32 1999/09/10 06:19:48 tholo Exp $
 
 .include <bsd.own.mk>
 
@@ -31,12 +31,12 @@ config: .FORCE
 	-rm -f config.cache
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-		sh ${.CURDIR}/configure --prefix=/usr ${KRB} ${CF}
+		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/libdata ${KRB} ${CF}
 
 config.status:
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
-		sh ${.CURDIR}/configure --prefix=/usr ${KRB} ${CF}
+		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/libdata ${KRB} ${CF}
 
 .ifdef NOMAN
 maninstall:
diff --git a/gnu/usr.bin/cvs/Makefile.in b/gnu/usr.bin/cvs/Makefile.in
index 7822dfeb0fa..955cee96100 100644
--- a/gnu/usr.bin/cvs/Makefile.in
+++ b/gnu/usr.bin/cvs/Makefile.in
@@ -50,16 +50,19 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 # Where to install the executables.
-bindir = $(exec_prefix)/bin
+bindir = @bindir@
+
+# Where to put auxilliary programs
+libexecdir = @libexecdir@
 
 # Where to put the system-wide .cvsrc file
-libdir = $(prefix)/lib
+datadir = @datadir@
 
 # Where to put the Info files
-infodir = $(prefix)/info
+infodir = @infodir@
 
 # Where to put the manual pages.
-mandir = $(prefix)/man
+mandir = @mandir@
 
 #### End of system configuration section. ####
 
@@ -77,7 +80,8 @@ FLAGS_TO_PASS = \
 	YACC='$(YACC)' \
 	bindir='$(bindir)' \
 	infodir='$(infodir)' \
-	libdir='$(libdir)' \
+	libexecdir='$(libexecdir)' \
+	datadir='$(datadir)' \
 	mandir='$(mandir)' \
 	prefix='$(prefix)' \
 	exec_prefix='$(exec_prefix)'
diff --git a/gnu/usr.bin/cvs/contrib/Makefile.in b/gnu/usr.bin/cvs/contrib/Makefile.in
index c3ea9b03c40..2ae38175549 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile.in
+++ b/gnu/usr.bin/cvs/contrib/Makefile.in
@@ -25,7 +25,10 @@ exec_prefix = @exec_prefix@
 bindir = $(exec_prefix)/bin
 
 # Where to put the system-wide .cvsrc file
-libdir = $(prefix)/lib
+libexecdir = $(prefix)/libexec
+
+# Where to put the system-wide .cvsrc file
+datadir = $(prefix)/share
 
 # Where to put the manual pages.
 mandir = $(prefix)/man
@@ -46,7 +49,7 @@ DISTFILES = \
 	descend.man dirfns.shar log.pl log_accum.pl mfpipe.pl rcs-to-cvs.sh \
 	rcs2log.sh rcslock.pl sccs2rcs.csh rcs2sccs.sh
 
-# files installed in $(libdir)/cvs/contrib
+# files installed in $(datadir)/cvs/contrib
 #
 CONTRIB_FILES = README intro.doc cvscheck.man
 
@@ -80,10 +83,10 @@ all: Makefile $(PROGS) $(CONTRIB_PROGS)
 
 install: all installdirs
 	for f in $(CONTRIB_FILES) ; do\
-		$(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
+		$(INSTALL_DATA) $(srcdir)/$$f $(datadir)/cvs/contrib/$$f; \
 	done
 	for f in $(CONTRIB_PROGS) ; do\
-		$(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
+		$(INSTALL_PROGRAM) $$f $(libexecdir)/cvs/contrib/$$f; \
 	done
 	for f in $(PROGS) ; do\
 		$(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
@@ -91,7 +94,8 @@ install: all installdirs
 .PHONY: install
 
 installdirs:
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(libdir)/cvs/contrib
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(datadir)/cvs/contrib
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(libexecdir)/cvs/contrib
 .PHONY: installdirs
 
 tags:
diff --git a/gnu/usr.bin/cvs/src/Makefile.in b/gnu/usr.bin/cvs/src/Makefile.in
index 5f8e1cb19e6..0caeb48f3f9 100644
--- a/gnu/usr.bin/cvs/src/Makefile.in
+++ b/gnu/usr.bin/cvs/src/Makefile.in
@@ -25,7 +25,7 @@ exec_prefix = @exec_prefix@
 bindir = $(exec_prefix)/bin
 
 # Where to put the system-wide .cvsrc file
-libdir = $(prefix)/lib
+datadir = $(prefix)/share
 
 # Where to put the manual pages.
 mandir = $(prefix)/man
@@ -166,7 +166,7 @@ cvsbug: cvsbug.sh $(srcdir)/version.c
 		    -e '/version_string/!d' \
 		    -e 's/[^0-9.]*\([0-9.]*\).*/\1/' \
 		    -e q`
-	sed -e 's,xLIBDIRx,$(libdir)/cvs,g' \
+	sed -e 's,xDATADIRx,$(datadir)/cvs,g' \
 	    -e "s,xVERSIONx,`cat .fname`,g" $(srcdir)/$@.sh > $@-t
 	rm -f .fname
 	mv $@-t $@