Pass some more args to gnu configure scripts to get the correct dirs

and remove specific hacks from templates.

--HG--
extra : convert_revision : 3abbceb03c42e5d38bfae226ee433f2461b77ce7

pkgfs.sh

@@ -493,6 +493,8 @@ build_tmpl_sources()
 				--exec-prefix="$PKGFS_DESTDIR/$pkgname" \
 				--mandir="$PKGFS_DESTDIR/$pkgname/man" \
 				--infodir="$PKGFS_DESTDIR/$pkgname/share/info" \
+				--libdir="$PKGFS_MASTERDIR/lib" \
+				--includedir="$PKGFS_MASTERDIR/include" \
 				${configure_args}
 
 	#