--- Makefile.install.UNIX.orig	Wed Aug 23 06:03:14 2006
+++ Makefile.install.UNIX	Sat Sep  2 12:38:12 2006
@@ -27,12 +27,12 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p -m 0755
 
-MAN          = $(BIN).1.bz2
+MAN          = $(BIN).1
 ICON         = $(BIN).xpm
 MANVIEW_ICON = manview.xpm
 
 BIN_DIR   = $(PREFIX)/bin
-ICONS_DIR = $(PREFIX)/share/icons
+ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
 DATA_DIR  = $(PREFIX)/share/$(BIN)
 MAN_DIR   = $(PREFIX)/man/man1
 
@@ -43,30 +43,30 @@
 install_bin:
 	@echo "Installing $(BIN) -> $(BIN_DIR)"
 	@$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
-	@$(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR)
+	@$(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR)
 	@echo "Installing manview -> $(BIN_DIR)"
-	@$(INSTALL) $(INSTSCRFLAGS) utils/manview.sh $(BIN_DIR)/manview
+	@$(BSD_INSTALL_SCRIPT) utils/manview.sh $(BIN_DIR)/manview
 	@echo "Installing manwrap -> $(BIN_DIR)"
-	@$(INSTALL) $(INSTSCRFLAGS) utils/manwrap.sh $(BIN_DIR)/manwrap
+	@$(BSD_INSTALL_SCRIPT) utils/manwrap.sh $(BIN_DIR)/manwrap
 
 install_data:
 	@echo "Installing $(MAN) -> $(MAN_DIR)"
 	@$(MKDIR) $(MKDIRFLAGS) $(MAN_DIR)
 	@-$(RM) $(RMFLAGS) $(MAN_DIR)/$(BIN).1
 	@-$(RM) $(RMFLAGS) $(MAN_DIR)/$(BIN).1.gz
-	@$(INSTALL) $(INSTMANFLAGS) $(MAN) $(MAN_DIR)
+	@$(BSD_INSTALL_MAN) $(MAN).out $(MAN_DIR)/$(MAN)
 	@echo "Installing $(ICON) -> $(ICONS_DIR)"
 	@$(MKDIR) $(MKDIRFLAGS) $(ICONS_DIR)
-	@$(INSTALL) $(INSTDATFLAGS) $(ICON) $(ICONS_DIR)
+	@$(BSD_INSTALL_DATA) $(ICON) $(ICONS_DIR)
 	@echo "Installing $(MANVIEW_ICON) -> $(ICONS_DIR)"
 	@$(INSTALL) $(INSTDATFLAGS) $(MANVIEW_ICON) $(ICONS_DIR)
 	@echo "Installing help files to $(DATA_DIR)/help"
 	@$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
 	@$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/help
-	@$(COPY) $(COPYFLAGS) help/* $(DATA_DIR)/help
+	@$(BSD_INSTALL_DATA) help/* $(DATA_DIR)/help
 	@echo "Installing templates to $(DATA_DIR)/templates"
 	@$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/templates
-	@$(COPY) $(COPYFLAGS) templates/* $(DATA_DIR)/templates
+	@$(BSD_INSTALL_DATA) templates/* $(DATA_DIR)/templates
 
 preinstall:
 	@echo "Installing \"$(BIN)\"..."