--- Makefile.orig	Tue Feb 13 09:08:59 2001
+++ Makefile	Sat Mar 10 17:36:25 2001
@@ -62,7 +62,7 @@ endif
 ifneq ($(DEBUG),NO)
   override CFLAGS          = -DDEBUG -g
 else
-  override CFLAGS          = -DNDEBUG -O2
+  override CFLAGS          += -DNDEBUG #-O2
 endif
 C_WARN_FLAG                = -Wall
 override CFLAGS           += $(C_WARN_FLAG) $(INC) $(CF_VERS)
@@ -116,15 +116,17 @@ $(VIDEOLIB_LIB) :
 tv.o : tv.c app_rsrc.h
 
 install : fxtv
-	mkdir -p $(FXTV_LIBDIR)/bitmaps
-	install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps
-	install -c -m 444 -o root README $(FXTV_LIBDIR)
-	mkdir -p $(X11BASEINST)/lib/X11/app-defaults
-	install -c -m 444 -o root Fxtv $(X11BASEINST)/lib/X11/app-defaults
-	mkdir -p $(X11BASEINST)/bin
-	install -c -m 444 -o root fxtv.1 $(X11BASEINST)/man/man1/fxtv.1
-	install -c -m 555 -o root fxtv $(X11BASEINST)/bin
-	install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR)
+	mkdir -p $(DESTDIR)$(FXTV_LIBDIR)/bitmaps
+	$(BSD_INSTALL_DATA) $(PIXMAPS) $(DESTDIR)$(FXTV_LIBDIR)/bitmaps
+	$(BSD_INSTALL_DATA) README $(DESTDIR)$(FXTV_LIBDIR)
+	mkdir -p $(DESTDIR)$(X11BASEINST)/lib/X11/app-defaults
+	$(BSD_INSTALL_DATA) Fxtv \
+		$(DESTDIR)$(X11BASEINST)/lib/X11/app-defaults
+	mkdir -p $(DESTDIR)$(X11BASEINST)/bin
+	$(BSD_INSTALL_MAN) fxtv.1 \
+		$(DESTDIR)$(X11BASEINST)/man/man1/fxtv.1
+	$(BSD_INSTALL_PROGRAM) fxtv $(DESTDIR)$(X11BASEINST)/bin
+	$(BSD_INSTALL_SCRIPT) fxtv_cnvt.sh $(DESTDIR)$(FXTV_LIBDIR)
 
 clean:
 	rm -f *.o fxtv *.core *~