===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/Attic/Makefile.bsd-wrapper,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/less/Attic/Makefile.bsd-wrapper	1999/02/03 23:36:45	1.18
--- src/usr.bin/less/Attic/Makefile.bsd-wrapper	2003/04/13 18:26:25	1.19
***************
*** 1,4 ****
! #	$OpenBSD: Makefile.bsd-wrapper,v 1.18 1999/02/03 23:36:45 millert Exp $
  
  #
  # less config
--- 1,4 ----
! #	$OpenBSD: Makefile.bsd-wrapper,v 1.19 2003/04/13 18:26:25 millert Exp $
  
  #
  # less config
***************
*** 6,12 ****
  PREFIX=		/usr
  BINDIR=		${PREFIX}/bin
  DATADIR=	${PREFIX}/share/misc
- LESS_HLP=	more.help
  LIBS=		-lcurses
  LINKS=		${BINDIR}/less ${BINDIR}/more ${BINDIR}/less ${BINDIR}/page
  MAN=		less.1 lesskey.1
--- 6,11 ----
***************
*** 16,24 ****
  #
  # Wrapped flags
  #
! WCC=		CC="${CC}"
! WCFLAGS=	CFLAGS="${CFLAGS} ${COPTS}"
! WLDFLAGS=	LDFLAGS="${LDSTATIC}"
  
  all: config.status gnu_build
  
--- 15,21 ----
  #
  # Wrapped flags
  #
! XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDFLAGS} ${LDSTATIC}"
  
  all: config.status gnu_build
  
***************
*** 38,45 ****
  	tags.o ttyin.o version.o
  .SUFFIXES: .o .c
  .c.o: config.status
! 	@$(MAKE) ${WCC} ${WCFLAGS} ${WLDFLAGS} LIBS=${LIBS} \
! 		 datadir=${DATADIR} LESS_HLP=${LESS_HLP} ${.TARGET}
  
  .FORCE: .IGNORE
  
--- 35,42 ----
  	tags.o ttyin.o version.o
  .SUFFIXES: .o .c
  .c.o: config.status
! 	@$(MAKE) ${XCFLAGS} LIBS=${LIBS} \
! 		 datadir=${DATADIR} ${.TARGET}
  
  .FORCE: .IGNORE
  
***************
*** 48,72 ****
  .ifdef GLOBAL_AUTOCONF_CACHE
  CF=     --cache-file=${GLOBAL_AUTOCONF_CACHE}
  .else
! CF=
  .endif
  
  config: .FORCE
  .ifndef GLOBAL_AUTOCONF_CACHE
  	-rm -f config.cache
  .endif
! 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
  	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
! 		/bin/sh ${.CURDIR}/configure --prefix=/usr ${CF}
  
  config.status:
! 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
  	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
! 		/bin/sh ${.CURDIR}/configure --prefix=/usr ${CF}
  
  gnu_build:
! 	${MAKE} ${WCC} ${WCFLAGS} ${WLDFLAGS} LIBS=${LIBS} datadir=${DATADIR} \
! 		LESS_HLP=${LESS_HLP}
  
  .ifdef NOMAN
  maninstall:
--- 45,70 ----
  .ifdef GLOBAL_AUTOCONF_CACHE
  CF=     --cache-file=${GLOBAL_AUTOCONF_CACHE}
  .else
! CF=	--cache-file=config.cache
  .endif
  
  config: .FORCE
  .ifndef GLOBAL_AUTOCONF_CACHE
  	-rm -f config.cache
  .endif
! 	${XCFLAGS} PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
  	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
! 		TERMLIBS=-lcurses /bin/sh ${.CURDIR}/configure \
! 		--prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc ${CF}
  
  config.status:
! 	${XCFLAGS} PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
  	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
! 		TERMLIBS=-lcurses /bin/sh ${.CURDIR}/configure \
! 		--prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc ${CF}
  
  gnu_build:
! 	${MAKE} ${XCFLAGS} LIBS=${LIBS} datadir=${DATADIR}
  
  .ifdef NOMAN
  maninstall:
***************
*** 88,95 ****
  .endif
  
  gnu_install:
! 	${MAKE} ${WCC} ${WCFLAGS} ${WLDFLAGS} LIBS=${LIBS} \
! 		LESS_HLP=${LESS_HLP} bindir=${DESTDIR}${BINDIR} \
  		datadir=${DESTDIR}${PREFIX}/share/misc \
  		INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \
  		INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444" \
--- 86,93 ----
  .endif
  
  gnu_install:
! 	${MAKE} ${XCFLAGS} LIBS=${LIBS} \
! 		bindir=${DESTDIR}${BINDIR} \
  		datadir=${DESTDIR}${PREFIX}/share/misc \
  		INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \
  		INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444" \