--- deliantra/Deliantra-Client/Makefile.PL	2006/04/21 12:27:19	1.34
+++ deliantra/Deliantra-Client/Makefile.PL	2006/05/14 22:58:24	1.39
@@ -12,12 +12,12 @@
 EOF
 
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
-   warn "do manual configuration, please\n";
-   $INC  = "-I/gtk/include -I/gtk/include/pango-1.0 -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include/ -I/gtk/include/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 -lfontconfig -lz -lopengl32",
+   warn "\ndo manual configuration by editing Makefile.PL, please\n\n";
+   $INC  = "-I/gtk/include -I/gtk/include/pango-1.0 -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include/ -I/gtk/include/freetype2 -I/gtk/include/cairo";
+   $LIBS = "-L/gtk/lib -lSDL -lSDL_image -lSDL_mixer -lpangoft2-1.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfreetype -lcairo -lfontconfig -lz -lopengl32 -lm",
 } 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  = join " ", qx<sdl-config --cflags>, qx<pkg-config pangoft2 --cflags>, qx<pkg-config pangocairo --cflags>;
+   $LIBS = join " ", qx<sdl-config --libs>, "-lSDL_image -lSDL_mixer", qx<pkg-config pangoft2 --libs>, qx<pkg-config pangocairo --libs>;
 
    $INC =~ s/\n/ /g for $INC, $LIBS;
 }
@@ -47,8 +47,8 @@
        'CFClient/UI.pm'                 => '$(INST_LIBDIR)/CFClient/UI.pm',
        'CFClient/MapWidget.pm'          => '$(INST_LIBDIR)/CFClient/MapWidget.pm',
        (map +($_ => "\$(INST_LIBDIR)/CFClient/$_"),
-          <resources/*.ttf>,
           <resources/*.png>,
+          <resources/fonts/*.ttf>,
           <resources/sounds/*.wav>,
           <resources/sounds/*.ogg>,
           <resources/sounds/config>,