===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/Attic/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.2
diff -c -r1.1.1.1 -r1.1.1.2
*** src/usr.bin/less/Attic/Makefile.in	1996/09/21 05:39:44	1.1.1.1
--- src/usr.bin/less/Attic/Makefile.in	2003/04/13 18:21:21	1.1.1.2
***************
*** 21,33 ****
  exec_prefix = @exec_prefix@
  
  # Where the installed binary goes.
! bindir = ${exec_prefix}/bin
  binprefix = 
  
! # Where the help file goes.
! datadir = ${prefix}/share
  
! mandir = ${prefix}/man/man${manext}
  manext = 1
  manprefix = 
  
--- 21,32 ----
  exec_prefix = @exec_prefix@
  
  # Where the installed binary goes.
! bindir = @bindir@
  binprefix = 
  
! sysconfdir = @sysconfdir@
  
! mandir = @mandir@
  manext = 1
  manprefix = 
  
***************
*** 38,67 ****
  # This rule allows us to supply the necessary -D options
  # in addition to whatever the user asks for.
  .c.o:
! 	${CC} -I. ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $<
  
- SRC =	main.c screen.c brac.c ch.c charset.c cmdbuf.c \
- 	command.c decode.c edit.c filename.c forwback.c \
- 	help.c ifile.c input.c jump.c line.c linenum.c \
- 	lsystem.c mark.c optfunc.c option.c opttbl.c os.c \
- 	output.c position.c prompt.c search.c signal.c \
- 	tags.c ttyin.c version.c  
  OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
  	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
  	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
  	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
  	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
  	tags.${O} ttyin.${O} version.${O}  @REGEX_O@
- DISTFILES = ${SRC} regexp.c regexp.h \
- 	INSTALL Makefile.in README NEWS \
- 	configure configure.in acconfig.h lesskey.c \
- 	cmd.h funcs.h less.h lesskey.h option.h position.h \
- 	install.sh defines.h.in defines.h.top mkinstalldirs \
- 	less.nro lesskey.nro less.man lesskey.man less.hlp \
- 	Makefile.dos defines.dos doscreen.c \
- 	Makefile.os2 defines.os2
  
! all: less lesskey
  
  less: ${OBJ}
  	${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
--- 37,52 ----
  # This rule allows us to supply the necessary -D options
  # in addition to whatever the user asks for.
  .c.o:
! 	${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<
  
  OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
  	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
  	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
  	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
  	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
  	tags.${O} ttyin.${O} version.${O}  @REGEX_O@
  
! all: less lesskey lessecho
  
  less: ${OBJ}
  	${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
***************
*** 69,93 ****
  lesskey: lesskey.${O} version.${O}
  	${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
  
! ${OBJ}: less.h defines.h funcs.h
  
! filename.${O}: filename.c
! 	${CC} -c -DHELPFILE=\"${datadir}/less.hlp\" -I. ${CPPFLAGS} ${CFLAGS} ${srcdir}/filename.c
  
! install: all less.hlp less.nro installdirs
  	${INSTALL_PROGRAM} less ${bindir}/${binprefix}less
  	${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey
! 	${INSTALL_DATA} ${srcdir}/less.hlp ${datadir}/less.hlp
! 	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/${manprefix}less.${manext}
! 	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/${manprefix}lesskey.${manext}
  
  installdirs: mkinstalldirs
! 	${srcdir}/mkinstalldirs ${bindir} ${datadir} ${mandir}
  
  uninstall:
! 	rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey
! 	rm -f ${datadir}/less.hlp
! 	rm -f ${mandir}/less.${manext} ${mandir}/lesskey.${manext}
  
  info:
  install-info:
--- 54,80 ----
  lesskey: lesskey.${O} version.${O}
  	${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O}
  
! lessecho: lessecho.${O} version.${O}
! 	${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
  
! ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h 
  
! install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro installdirs
  	${INSTALL_PROGRAM} less ${bindir}/${binprefix}less
  	${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey
! 	${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho
! 	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/man${manext}/${manprefix}less.${manext}
! 	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/man${manext}/${manprefix}lesskey.${manext}
  
+ install-strip:
+ 	${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install
+ 
  installdirs: mkinstalldirs
! 	${srcdir}/mkinstalldirs ${bindir} ${mandir}/man${manext}
  
  uninstall:
! 	rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey ${bindir}/${binprefix}lessecho
! 	rm -f ${mandir}/man${manext}/${manprefix}less.${manext} ${mandir}/man${manext}/${manprefix}lesskey.${manext}
  
  info:
  install-info:
***************
*** 104,125 ****
  stamp-h: defines.h.in config.status
  	test ! -f stamp-h || CONFIG_FILES= CONFIG_HEADERS=defines.h ./config.status
  	touch stamp-h
! Makefile: Makefile.in config.status
  	CONFIG_FILES=Makefile CONFIG_HEADERS= ./config.status
  config.status: ${srcdir}/configure
  	./config.status --recheck
  
! configure: configure.in
! 	autoheader
! 	autoconf
  
- lint:
- 	lint -I. ${CPPFLAGS} ${SRC}
- newfuncs:
- 	mv -f funcs.h funcs.h.old
- 	awk -f mkfuncs.awk ${SRC} >funcs.h
  clean:
! 	rm -f *.${O} core less lesskey
  
  mostlyclean: clean
  
--- 91,106 ----
  stamp-h: defines.h.in config.status
  	test ! -f stamp-h || CONFIG_FILES= CONFIG_HEADERS=defines.h ./config.status
  	touch stamp-h
! Makefile: ${srcdir}/Makefile.in config.status
  	CONFIG_FILES=Makefile CONFIG_HEADERS= ./config.status
  config.status: ${srcdir}/configure
  	./config.status --recheck
  
! ${srcdir}/configure: ${srcdir}/configure.ac
! 	cd ${srcdir}; autoheader; autoconf
  
  clean:
! 	rm -f *.${O} core less lesskey lessecho
  
  mostlyclean: clean
  
***************
*** 129,148 ****
  realclean: distclean
  	rm -f TAGS
  
- dist: ${DISTFILES}
- 	if [ ! -d release ]; then mkdir release; fi
- 	@REL=`sed -e '/char version/!d' -e 's/[^0-9.]*\([0-9.]*\).*/less-\1/' -e q version.c`; \
- 	rm -rf release/$$REL; mkdir release/$$REL; \
- 	echo "Creating release/$$REL/$$REL.tar.gz"; \
- 	rm -rf $$REL; mkdir $$REL; \
- 	for file in ${DISTFILES}; do \
- 	  ln $$file $$REL || \
- 	  { echo "cannot link, copying $$file"; cp -p $$file $$REL; }; \
- 	done; \
- 	tar -chf - $$REL | gzip -c >release/$$REL/$$REL.tar.gz; \
- 	rm -rf $$REL
- 
- tagall:
- 	@REL=`sed -e '/char version/!d' -e 's/[^0-9.]*\([0-9.]*\).*/v\1/' -e q version.c`; \
- 	echo "tagging $$REL"; \
- 	$(RCS) -N$$REL: RCS/*,v
--- 110,112 ----