diff -Naur x264-snapshot-20100905-2245/configure x264-snapshot-20100905-2245-magellan/configure
--- x264-snapshot-20100905-2245/configure	2010-09-05 22:45:07.000000000 +0200
+++ x264-snapshot-20100905-2245-magellan/configure	2010-09-06 22:24:27.000000000 +0200
@@ -754,7 +754,6 @@
         echo "SONAME=libx264.so.$API" >> config.mak
         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
     fi
-    echo 'default: $(SONAME)' >> config.mak
 fi
 
 ./version.sh >> config.h
diff -Naur x264-snapshot-20100905-2245/Makefile x264-snapshot-20100905-2245-magellan/Makefile
--- x264-snapshot-20100905-2245/Makefile	2010-09-05 22:45:07.000000000 +0200
+++ x264-snapshot-20100905-2245-magellan/Makefile	2010-09-06 22:27:13.000000000 +0200
@@ -130,8 +130,8 @@
 $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
 
-x264$(EXE): $(OBJCLI) libx264.a
-	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
+x264$(EXE): $(OBJCLI)
+	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) `pkg-config --libs x264`
 
 checkasm: tools/checkasm.o libx264.a
 	$(CC) -o $@ $+ $(LDFLAGS)
@@ -196,23 +196,9 @@
 	rm -f config.mak config.h config.log x264.pc
 	rm -rf test/
 
-install: x264$(EXE) $(SONAME)
+install: x264$(EXE)
 	install -d $(DESTDIR)$(bindir)
-	install -d $(DESTDIR)$(includedir)
-	install -d $(DESTDIR)$(libdir)
-	install -d $(DESTDIR)$(libdir)/pkgconfig
-	install -m 644 x264.h $(DESTDIR)$(includedir)
-	install -m 644 libx264.a $(DESTDIR)$(libdir)
-	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
 	install x264$(EXE) $(DESTDIR)$(bindir)
-	$(RANLIB) $(DESTDIR)$(libdir)/libx264.a
-ifeq ($(SYS),MINGW)
-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
-else
-	$(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
-endif
-	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
 
 uninstall:
 	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a