--- Makefile.orig Thu May 16 02:33:02 2002 +++ Makefile Thu May 16 02:38:50 2002 @@ -1,10 +1,9 @@ # $Id: Makefile,v 1.50 2002/04/03 15:44:18 prahl Exp $ -CC=gcc MKDIR=mkdir -p LIBS= -CFLAGS:=-DUNIX +CFLAGS+=-DUNIX #CFLAGS:=-DMSDOS #CFLAGS:=-DMACINTOSH @@ -12,10 +11,8 @@ #CFLAGS:=$(CFLAGS) -DHAS_NO_GETOPT #Comment out if you don't want compiler warnings -CFLAGS:=$(CFLAGS) -g -Wall -ansi -pedantic #Base directory -PREFIX=/usr/local # Location of binary, man, info, and support files BIN_INSTALL=$(PREFIX)/bin @@ -123,13 +120,13 @@ $(MKDIR) $(BIN_INSTALL) $(MKDIR) $(MAN_INSTALL) $(MKDIR) $(CFG_INSTALL) - cp latex2rtf $(BIN_INSTALL) - cp scripts/latex2png $(BIN_INSTALL) - cp doc/latex2rtf.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) + ${BSD_INSTALL_PROGRAM} latex2rtf $(BIN_INSTALL) + ${BSD_INSTALL_SCRIPT} scripts/latex2png $(BIN_INSTALL) + ${BSD_INSTALL_MAN} doc/latex2rtf.1 $(MAN_INSTALL) + ${BSD_INSTALL_DATA} $(CFGS) $(CFG_INSTALL) + ${BSD_INSTALL_DATA} doc/latex2rtf.html $(SUPPORT_INSTALL) + ${BSD_INSTALL_DATA} doc/latex2rtf.pdf $(SUPPORT_INSTALL) + ${BSD_INSTALL_DATA} doc/latex2rtf.txt $(SUPPORT_INSTALL) @echo "******************************************************************" @echo "*** latex2rtf successfully installed" @echo "***" @@ -145,7 +142,7 @@ install-info: doc/latex2rtf.info $(MKDIR) $(INFO_INSTALL) - cp doc/latex2rtf.info $(BIN_INSTALL) + ${BSD_INSTALL_DATA} doc/latex2rtf.info $(BIN_INSTALL) install-info --info-dir=$(INFO_INSTALL) doc/latex2rtf.info realclean: checkdir clean