diff -up cinepaint-0.22-1/cinepainttool.in.multilib cinepaint-0.22-1/cinepainttool.in --- cinepaint-0.22-1/cinepainttool.in.multilib 2008-03-07 23:19:19.000000000 +0100 +++ cinepaint-0.22-1/cinepainttool.in 2008-03-07 23:36:50.000000000 +0100 @@ -71,8 +71,8 @@ if test $# -eq 0; then fi if test x${GTK_CONFIG+set} != xset ; then - gtk_cflags="@GTK_CFLAGS@ -I$include_dir" - gtk_libs='@GTK_LIBS@' + gtk_cflags="`pkg-config --cflags gtk+-2.0` -I$include_dir" + gtk_libs="`pkg-config --libs gtk+-2.0`" else gtk_cflags=`$GTK_CONFIG --cflags` gtk_libs=`$GTK_CONFIG --libs` @@ -89,7 +89,7 @@ else fi if test x${CFLAGS+set} != xset ; then - cflags='@CFLAGS@' + cflags="$CFLAGS" else cflags="$CFLAGS" fi @@ -165,9 +165,9 @@ while test $# -gt 0; do ;; --libs | --libs-nocinepaintui) my_gtk_libs= - libdirs=-L@libdir@ + libdirs="-L`pkg-config --variable libdir gtk+-2.0`" for i in $gtk_libs ; do - if test $i != -L@libdir@ ; then + if test $i != "-L`pkg-config --variable libdir gtk+-2.0`" ; then if test -z "$my_gtk_libs" ; then my_gtk_libs="$i" else @@ -202,9 +202,9 @@ while test $# -gt 0; do fi glib_libs="$glib_ldflags `echo $gtk_libs | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" my_glib_libs= - libdirs=-L@libdir@ + libdirs=-L`pkg-config --variable libdir gtk+-2.0` for i in $glib_libs ; do - if test $i != -L@libdir@ ; then + if test $i != -L`pkg-config --variable libdir gtk+-2.0` ; then if test -z "$my_glib_libs" ; then my_glib_libs="$i" else @@ -212,7 +212,7 @@ while test $# -gt 0; do fi fi done - echo -L@libdir@ -lcinepaint -lcinepaintHalf $my_glib_libs + echo -L`pkg-config --variable libdir gtk+-2.0` -lcinepaint -lcinepaintHalf $my_glib_libs ;; --install-dir) echo "$plug_in_dir/plug-ins"