--- /home/ohnobinki/gentoo-x86/media-plugins/live/files/config.gentoo-so-r1	2009-09-29 03:03:26.000000000 -0400
+++ files/config.gentoo-so-r2	2011-03-23 22:19:31.000000000 -0400
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
 C =			c
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
@@ -7,11 +7,12 @@
 CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
 OBJ =			o
 LINK =			$(CXX) -o
-LINK_OPTS =		-L.
+LINK_OPTS =		$(CXXFLAGS) $(LDFLAGS) -L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 LIBRARY_LINK =		$(CXX) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
+LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname=$@.$(LIVE_ABI_VERSION),-rpath,'$(LIBDIR)'
+LIB_SUFFIX =		so
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
 EXE =
+INSTALL =		install -c