--- Makefile.orig	Fri Sep 16 14:06:12 2011
+++ Makefile	Fri Sep 16 14:09:54 2011
@@ -15,8 +15,7 @@ options:
 	@echo "CC       = ${CC}"
 
 .c.o:
-	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
+	${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk
 
@@ -25,8 +24,7 @@ config.h:
 	@cp config.def.h $@
 
 tabbed: tabbed.o
-	@echo CC -o $@
-	@${CC} -o $@ tabbed.o ${LDFLAGS}
+	${CC} -o $@ tabbed.o ${LDFLAGS}
 
 clean:
 	@echo cleaning
@@ -42,14 +40,12 @@ dist: clean
 	@rm -rf tabbed-${VERSION}
 
 install: all
-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
-	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f tabbed ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/tabbed
-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed "s/VERSION/${VERSION}/g" < tabbed.1 > ${DESTDIR}${MANPREFIX}/man1/tabbed.1
-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/tabbed.1
+	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+	${BSD_INSTALL_PROGRAM} tabbed ${DESTDIR}${PREFIX}/bin
+	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
+	sed "s/VERSION/${VERSION}/g" < tabbed.1 > tabbed.1.tmp
+	mv tabbed.1.tmp tabbed.1
+	${BSD_INSTALL_MAN} tabbed.1 ${DESTDIR}${MANPREFIX}/man1
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin