--- cinelerra-1.1.5/mplexlo/Makefile.orig	Sat Jul 13 04:19:23 2002
+++ cinelerra-1.1.5/mplexlo/Makefile	Fri Mar 21 00:41:10 2003
@@ -2,12 +2,12 @@
 
 OBJS = $(OBJDIR)/mplex.o
 CC = gcc
-CFLAGS += -I../libmpeg3
+CFLAGS += -I/usr/include/libmpeg3
 
 OUTPUT := $(OBJDIR)/mplexlo
 
 $(OUTPUT): $(OBJS)
-	$(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
+	$(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
 
 $(OBJS):
 	$(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
--- cinelerra-1.1.7/cinelerra/Makefile.orig	2003-08-09 22:24:28.000000000 +0200
+++ cinelerra-1.1.7/cinelerra/Makefile	2003-08-16 23:10:48.654994168 +0200
@@ -1,12 +1,4 @@
-DV_DIR := ../quicktime/libdv-0.99
-ALSA_DIR := ../alsa-lib-0.9.0rc2
-OGG_DIR := ../quicktime/libogg-1.0
-VORBIS_DIR := ../quicktime/libvorbis-1.0
-LIBRAW_DIR := ../libraw1394-0.9.0
-TIFF_DIR := ../tiff-v3.5.7
-UUID_DIR := ../uuid
 TOOLAME_DIR := ../toolame-02l
-LAME_DIR := ../quicktime/lame-3.93.1/include
 include ../global_config
 
 OBJS = \
@@ -271,18 +263,12 @@
 
 ifeq ($(HAVE_ALSA), yes)
 ALSA_CFLAGS := -DHAVE_ALSA -I$(ALSA_DIR)/include
-ALSA_LIBS := $(ALSA_DIR)/$(OBJDIR)/libasound.a
+ALSA_LIBS := -lasound
 endif
 
 STATICLIBS = \
-	../libavc/$(OBJDIR)/libavc.a \
-	../quicktime/$(OBJDIR)/libquicktime.a \
         $(ESOUNDLIBS) \
-	$(TIFF_DIR)/$(OBJDIR)/libtiff.a \
 	../guicast/$(OBJDIR)/libguicast.a \
-	../libmpeg3/$(OBJDIR)/libmpeg3.a \
-	../libsndfile/$(OBJDIR)/libsndfile.a \
-	$(UUID_DIR)/$(OBJDIR)/libuuid.a \
 	../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
 	$(TOOLAME_DIR)/$(OBJDIR)/toolame.a
 
@@ -301,8 +287,13 @@
 
 
 LIBS += \
-	$(ALSA_LIBS) \
-	$(LIBRAW_DIR)/$(OBJDIR)/libraw1394.a \
+	-lavc1394 -lrom1394 \
+	-lquicktime -lvorbisfile \
+	-ltiff \
+	-lmpeg3 \
+	-lsndfile \
+	-luuid \
+	-lraw1394 \
 	$(GLLIBS) \
 	-lX11 \
 	-lXext \
@@ -317,22 +308,14 @@
 
 CFLAGS += \
 	-I../guicast \
-	-I../quicktime \
-	-I$(DV_DIR) \
-	-I$(OGG_DIR)/include \
-	-I$(VORBIS_DIR)/include \
-	-I$(LIBRAW_DIR)/src \
-	-I$(TIFF_DIR)/libtiff \
-	-I$(UUID_DIR) \
-	-I$(DV_DIR) \
+	-I/usr/include/quicktime \
+	-I/usr/include/libdv \
+	-I/usr/include/libraw1394 \
+	-I/usr/include/uuid \
 	-I$(TOOLAME_DIR) \
-	-I$(LAME_DIR) \
-	-I../audiofile \
-	-I../libmpeg3 \
-	-I../libsndfile \
-	-I../libavc/common \
-	-I../libavc/libavc1394 \
-	-I../libavc/librom1394 \
+	-I/usr/include/lame \
+	-I/usr/include/libmpeg3 \
+	-I/usr/include/libavc1394 \
 	$(ESOUNDCFLAGS) \
 	$(ALSA_CFLAGS) \
 	`glib-config --cflags`
--- cinelerra-1.1.5/global_config.orig	Wed Jan 29 07:32:31 2003
+++ cinelerra-1.1.5/global_config	Fri Mar 21 00:53:25 2003
@@ -15,7 +15,7 @@
 
 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
 
-PREFIX = /usr/local
+PREFIX = /usr
 LIBPREFIX = $(PREFIX)/lib
 
 ########################## COMPILER
@@ -41,8 +41,8 @@
 
 
 ifeq ($(HAVE_ESOUND), yes)
-ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
-ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
+ESOUNDCFLAGS = -DHAVE_ESOUND
+ESOUNDLIBS = -lesd
 endif
 
 
--- cinelerra-1.1.7/plugin_config.orig	2003-07-26 09:09:41.000000000 +0200
+++ cinelerra-1.1.7/plugin_config	2003-08-16 23:12:37.860392424 +0200
@@ -1,6 +1,6 @@
 CFLAGS += -I../ -I../../cinelerra \
 	-I../../guicast \
-	-I../../quicktime \
+	-I/usr/include/quicktime \
 	-I../colors \
 	-fPIC
 
--- cinelerra-1.1.5/mpeg2enc/Makefile.orig	Sat Aug  3 04:18:42 2002
+++ cinelerra-1.1.5/mpeg2enc/Makefile	Fri Mar 21 01:35:40 2003
@@ -1,6 +1,6 @@
 include ../global_config
 CC = gcc
-CFLAGS += -I../libmpeg3 -I../quicktime
+CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
 
 
 ifeq ($(OBJDIR), i686)
@@ -48,8 +48,8 @@
 	$(OBJDIR)/writepic.o
 
 LIBS = \
-	../../quicktime/$(OBJDIR)/libquicktime.a \
-	../../libmpeg3/$(OBJDIR)/libmpeg3.a \
+	-lquicktime \
+	-lmpeg3 \
 	-lpthread \
 	-lpng \
 	-lz \
--- cinelerra-1.1.7/plugins/titler/Makefile.orig	2003-07-20 11:05:04.000000000 +0200
+++ cinelerra-1.1.7/plugins/titler/Makefile	2003-08-16 23:19:45.490382784 +0200
@@ -1,5 +1,4 @@
-FREETYPE_DIR = ../../freetype-2.1.4
-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
+CFLAGS += -I/usr/include/freetype2
 
 include ../../global_config
 
@@ -15,12 +14,11 @@
 $(OUTPUT_PLUGIN): $(OBJS)
 	$(LDLINKER) -o $(OUTPUT_PLUGIN) \
 		$(OBJS) \
-		$(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
-	strip $(OUTPUT_PLUGIN)
+		-lfreetype
 
 include ../../plugin_config
 
-inst:
+install:
 	cp $(OUTPUT_PLUGIN) /usr/lib/cinelerra
 	cp -a fonts /usr/lib/cinelerra
 
--- cinelerra-1.1.5/cinelerra/jpegwrapper.h.orig	Fri Jun 21 14:35:24 2002
+++ cinelerra-1.1.5/cinelerra/jpegwrapper.h	Mon Mar 24 12:53:00 2003
@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-#include "jpeg/jpeglib.h"
+#include <jpeglib.h>
 
 #ifdef __cplusplus
 }