--- Makefile.orig	Mon Feb  9 03:12:03 2004
+++ Makefile	Wed Apr 28 15:00:49 2004
@@ -1,9 +1,8 @@
 # $Id: Makefile,v 1.101 2004/02/09 02:12:03 prahl Exp $
 
-CC=gcc
 MKDIR=mkdir -p
 
-CFLAGS:=-DUNIX
+CFLAGS+=-DUNIX
 #CFLAGS:=-DMSDOS         #Windows/DOS
 #CFLAGS:=-DMAC_CLASSIC   #MacOS 8/9
 #CFLAGS:=-DOS2           #OS/2
@@ -18,7 +17,7 @@
 #CFLAGS:=$(CFLAGS) -Zwin32  
 
 #Base directory - adapt as needed
-PREFIX=$(PREFIX_DRIVE)/usr/local
+#PREFIX=$(PREFIX_DRIVE)/usr/local
 
 #Name of executable binary --- beware of 8.3 restriction under DOS
 BINARY_NAME=latex2rtf$(EXE_SUFFIX)
@@ -29,10 +28,11 @@
 INFO_INSTALL=$(PREFIX)/info
 SUPPORT_INSTALL=$(PREFIX)/share/latex2rtf
 CFG_INSTALL=$(PREFIX)/share/latex2rtf/cfg
+DOC_INSTALL=$(PREFIX)/share/doc/latex2rtf
 
 # Nothing to change below this line
 
-CFLAGS:=$(CFLAGS) -g -Wall -fsigned-char
+CFLAGS+=-fsigned-char
 
 LIBS=
 #LIBS=-lMallocDebug -force_flat_namespace
@@ -153,14 +153,15 @@
 	$(MKDIR) $(BIN_INSTALL)
 	$(MKDIR) $(MAN_INSTALL)
 	$(MKDIR) $(CFG_INSTALL)
-	cp $(BINARY_NAME)     $(BIN_INSTALL)
-	cp scripts/latex2png  $(BIN_INSTALL)
-	cp doc/latex2rtf.1    $(MAN_INSTALL)
-	cp doc/latex2png.1    $(MAN_INSTALL)
-	cp $(CFGS)            $(CFG_INSTALL)
-	cp doc/latex2rtf.html $(SUPPORT_INSTALL)
-	cp doc/latex2rtf.pdf  $(SUPPORT_INSTALL)
-	cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
+	$(MKDIR) $(DOC_INSTALL)
+	${BSD_INSTALL_PROGRAM} $(BINARY_NAME)     $(BIN_INSTALL)
+	${BSD_INSTALL_SCRIPT} scripts/latex2png  $(BIN_INSTALL)
+	${BSD_INSTALL_MAN} doc/latex2rtf.1    $(MAN_INSTALL)
+	${BSD_INSTALL_MAN} doc/latex2png.1    $(MAN_INSTALL)
+	${BSD_INSTALL_DATA} $(CFGS)            $(CFG_INSTALL)
+	${BSD_INSTALL_DATA} doc/latex2rtf.html $(DOC_INSTALL)
+	${BSD_INSTALL_DATA} doc/latex2rtf.pdf  $(DOC_INSTALL)
+	${BSD_INSTALL_DATA} doc/latex2rtf.txt  $(DOC_INSTALL)
 	@echo "******************************************************************"
 	@echo "*** latex2rtf successfully installed as \"$(BINARY_NAME)\""
 	@echo "*** in directory \"$(BIN_INSTALL)\""
@@ -178,8 +179,8 @@
 
 install-info: doc/latex2rtf.info
 	$(MKDIR) $(INFO_INSTALL)
-	cp doc/latex2rtf.info $(INFO_INSTALL)
-	install-info --info-dir=$(INFO_INSTALL) doc/latex2rtf.info
+	${BSD_INSTALL_DATA} doc/latex2rtf.info $(INFO_INSTALL)
+	install-info --info-dir=$(INFO_INSTALL) $(INFO_INSTALL)/latex2rtf.info
 
 realclean: checkdir clean
 	rm -f makefile.depend latex2rtf-$(VERSION).tar.gz