# HG changeset patch
# User jkeil
# Date 1004015958 0
# Node ID 451426046a1473c05ed0c6ca6a328c6ec3eff8af
# Parent  a78e782fa9eb35a989d49fa8d4c9c944d01e33e8
CSS_INC include flags are now needed in libmpdemux, to compile dvdauth.c

diff -r a78e782fa9eb -r 451426046a14 Makefile
--- a/Makefile	Thu Oct 25 12:40:21 2001 +0000
+++ b/Makefile	Thu Oct 25 13:19:18 2001 +0000
@@ -16,9 +16,13 @@
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
 # BINDIR = /usr/local/bin
+
+# a BSD compatible 'install' program
+INSTALL = install
+
 SRCS = ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c
 OBJS = $(SRCS:.c=.o)
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) $(MADLIB_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(MADLIB_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB)
 VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
 OSDEP_LIBS = -Llinux -losdep
@@ -135,18 +139,18 @@
 
 install: $(ALL_PRG)
 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
-	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+	$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
 ifeq ($(GUI),yes)
 	-ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
 endif
 	if test ! -d $(prefix)/man/man1 ; then mkdir -p $(prefix)/man/man1; fi
-	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
 ifeq ($(CSS_USE),yes)
 	@echo "Following task requires root privs. 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 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+	-$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
 endif
 
 uninstall:
diff -r a78e782fa9eb -r 451426046a14 libmpdemux/Makefile
--- a/libmpdemux/Makefile	Thu Oct 25 12:40:21 2001 +0000
+++ b/libmpdemux/Makefile	Thu Oct 25 13:19:18 2001 +0000
@@ -9,7 +9,7 @@
 endif
 
 OBJS	= $(SRCS:.c=.o)
-INCLUDE = -I../loader $(EXTRA_INC)
+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE)
 
 .SUFFIXES: .c .o