--- dps/src/Makefile.in	2010-06-06 12:24:29.000000000 +0100
+++ dps/src/Makefile_gentoo.in	2010-06-06 10:45:16.000000000 +0100
@@ -1,8 +1,8 @@
 # Default command tools
 CC			=	g++ -g3
 LD			=	g++ -g3
-MOC			?=	@/usr/share/qt3/bin/moc
-UIC			?=	@/usr/share/qt3/bin/uic
+MOC			?=	@/usr/qt/3/bin/moc
+UIC			?=	@/usr/qt/3/bin/uic
 
 # Set default output location, name and version
 DEST		=	.
@@ -41,10 +41,10 @@
 # linker options. We also need to make a few more objects and generate
 # the necessary header files
 ifeq ($(QT_ENABLED),yes)
-	CCINC	+=	-I/usr/share/qt3/mkspecs/default -I/usr/include/qt3
+	CCINC	+=	-I/usr/qt/3/mkspecs/ -I/usr/qt/3/include/
 	CCFLAGS	+=	-pipe -W -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT \
 				-DQT_SHARED
-	LIBS	+=	-L/usr/share/qt3/lib -L/usr/X11R6/lib -lqt-mt #-lXext -lX11
+	LIBS	+=	-L/usr/qt/3/lib -L/usr/X11R6/lib -lqt-mt #-lXext -lX11
 	QT_OBJS	=	$(addprefix moc_,$(APP_QTOBJS)) \
 				$(addprefix $(ROOT)/src/moc_,$(SHARED_QTOBJS))
 endif
--- dps/Makefile	2010-06-06 16:21:55.000000000 +0100
+++ dps/Makefile_gentoo	2010-06-06 21:02:06.000000000 +0100
@@ -26,26 +26,28 @@
 # Application groups
 AUDIO		=	audiolib audiolib/oss audiolib/jack audiolib/alsa \
 				audiolib/raw audiolib/flac audiolib/mp3
-STUDIO		=	studio_play studio_manage
-SUE			=	sueplay suesched
+STUDIOP		=	studio_play
+STUDIOM		=	studio_manage
+STUDIO		=	$(STUDIOP) $(STUDIOM)
+SUE		=	sueplay suesched
 ADMIN		=	dpsadmin
 PLAYIN		=	playin
 DATABASE	=	db
-ALL			=	$(AUDIO) $(STUDIO) $(SUE) $(ADMIN) $(PLAYIN) $(DATABASE) \
+ALL		=	$(AUDIO) $(STUDIO) $(SUE) $(ADMIN) $(PLAYIN) $(DATABASE) \
 				audioplay audiotest audioflac
 
 # Built Executables
 EXE_STUDIO_MANAGE	=	src/studio_manage/studio_manage
 EXE_STUDIO_PLAY		=	src/studio_play/studio_play
 EXE_DPSADMIN		=	src/dpsadmin/dpsadmin
-EXE_PLAYIN			=	src/playin/playin
-EXE_SUEPLAY			=	src/sueplay/sueplay
+EXE_PLAYIN		=	src/playin/playin
+EXE_SUEPLAY		=	src/sueplay/sueplay
 EXE_SUESCHED		=	src/suesched/suesched
 LIB_DPSAUDIO		=	src/audiolib/libdpsaudio.so \
 						src/audiolib/libdpsaudio.so.$(VERSION)
-EXE_ALL				=	$(EXE_STUDIO_MANAGE) $(EXE_STUDIO_PLAY) $(EXE_DPSADMIN)\
-						$(EXE_PLAYIN) $(EXE_SUEPLAY) $(EXE_SUESCHED)
-LIB_ALL				=	$(LIB_DPSAUDIO)
+EXE_ALL			=	$(EXE_STUDIO_MANAGE) $(EXE_STUDIO_PLAY) $(EXE_DPSADMIN)\
+					$(EXE_PLAYIN) $(EXE_SUEPLAY) $(EXE_SUESCHED)
+LIB_ALL			=	$(LIB_DPSAUDIO)
 
 .PHONY: default all clean install doc tar audio studio sue backend database
 
@@ -54,8 +56,9 @@
 default:	all
 
 audio:		$(AUDIO)
-studio: 	$(AUDIO) $(STUDIO)
-sue:		$(AUDIO) $(SUE)
+studiop: 	$(STUDIOP)
+studiom:	$(STUDIOM)
+sue:		$(SUE)
 backend:	$(ADMIN)
 database:	$(DATABASE)