--- Makefile.orig	Thu Jul 25 05:37:27 2002
+++ Makefile	Wed Aug  7 13:07:21 2002
@@ -24,12 +24,12 @@
 endif
 
 #prefix = /usr/local
-BINDIR = ${prefix}/bin
+BINDIR = $(PREFIX)/bin
 # BINDIR = /usr/local/bin
-MANDIR = ${prefix}/man
+MANDIR = $(PREFIX)/man
 
 # a BSD compatible 'install' program
-INSTALL = install
+INSTALL = @${BSD_INSTALL_PROGRAM}
 
 SRCS_COMMON = xacodec.c cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c
 SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c me-opt-reg.c
@@ -226,44 +226,11 @@
 ifeq ($(VIDIX),yes)
 	$(DO_MAKE)
 endif
-	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
-ifeq ($(GUI),yes)
-	-ln -sf $(PRG) $(BINDIR)/gmplayer
-endif
-	if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
-	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
+	@${BSD_INSTALL_MAN} DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
 ifeq ($(MENCODER),yes)
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
 	-ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
-endif
-	@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
-	@if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
-	@if test ! -f $(DATADIR)/font/font.desc ; then \
-	echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \
-	echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
-	fi
-ifeq ($(GUI),yes)
-	@if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
-	@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
-	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
-endif
-	@if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
-	@if test -f $(CONFDIR)/codecs.conf.old ; then mv -f $(CONFDIR)/codecs.conf.old $(CONFDIR)/codecs.conf.older ; fi
-	@if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
-	$(INSTALL) -c -m 644 etc/codecs.conf $(CONFDIR)/codecs.conf
-ifeq ($(DVDKIT),yes)
-ifeq ($(DVDKIT_SHARED),yes)
-	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
-	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
-endif
-endif
-ifeq ($(CSS_USE),yes)
-	@echo "The following task requires root privileges. If it fails don't panic,"
-	@echo "however it means you can't use fibmap_mplayer."
-	@echo "Without this (or without running mplayer as root) you won't be"
-	@echo "able to play encrypted DVDs."
-	-$(INSTALL) -o 0 -g 0 -m 4755 $(INSTALLSTRIP) $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
 endif
 
 uninstall: