--- deliantra/Deliantra-Client/Makefile.PL	2006/04/17 21:42:50	1.24
+++ deliantra/Deliantra-Client/Makefile.PL	2006/04/17 21:52:42	1.25
@@ -11,11 +11,13 @@
 
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
    warn "do manual configuration, please\n";
-   $INC  = "-I/usr/include/SDL -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2";
-   $LIBS = "-lSDL -lSDL_image -lSDL_mixer -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfreetype -lz",
+   $INC  = "-I/gtk/include -I/gtk/pango-1.0 -I/gtk/glib-2.0 -I/gtk/freetype2";
+   $LIBS = "-L/gtk/lib -lSDL -lSDL_image -lSDL_mixer -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfreetype -lz",
 } else {
    $INC  = join " ", qx<sdl-config --cflags>, qx<pkg-config pangoft2 --cflags>;
    $LIBS = join " ", qx<sdl-config --libs>, "-lSDL_image -lSDL_mixer", qx<pkg-config pangoft2 --libs>;
+
+   $INC =~ s/\n/ /g for $INC, $LIBS;
 }
 
 WriteMakefile(
@@ -25,8 +27,8 @@
 	            SUFFIX	=> '.gz',
 	           },
     NAME => "CFClient",
-    INC => '-I/usr/include/SDL -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2',
-    LIBS => ["-lSDL -lSDL_image -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfreetype -lz"],
+    INC => $INC,
+    LIBS => [$LIBS],
     EXE_FILES => [qw(bin/pclient)],
     VERSION_FROM => "CFClient.pm",
     PREREQ_PM => {