Revert "Adjust pkg-config files to include files residing in separate subdirectories."

Originally committed as revision 12947 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure

@@ -2119,7 +2119,7 @@ cat <<EOF >$name.pc
 prefix=$prefix
 exec_prefix=\${prefix}
 libdir=$libdir
-includedir=$incdir/$name
+includedir=$incdir
 
 Name: $name
 Description: $comment
@@ -2142,7 +2142,7 @@ cat <<EOF >$name-uninstalled.pc
 prefix=
 exec_prefix=
 libdir=\${pcfiledir}/$name
-includedir=\${pcfiledir}/$name
+includedir=\${pcfiledir}
 
 Name: $name
 Description: $comment