=== modified file 'configure.ac'
--- configure.ac	2010-06-11 05:06:49 +0000
+++ configure.ac	2010-06-11 05:41:51 +0000
@@ -547,23 +547,13 @@
 dnl check various things
 AC_FUNC_ALLOCA
 
-if test "x${prefix}" = "xNONE"; then
-	package_prefix=${ac_default_prefix}
-else
-	package_prefix=${prefix}
-fi
-
-if test x$mingw_found = xyes ; then
-	package_prefix="."
-fi
-
 dnl define path of plugins:
-AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR, "${package_prefix}/lib/mediastreamer/plugins" ,[path of plugins])
-PACKAGE_PLUGINS_DIR="${package_prefix}/lib/mediastreamer/plugins"
+PACKAGE_PLUGINS_DIR="$libdir/mediastreamer/plugins"
+AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR, ["$PACKAGE_PLUGINS_DIR"] ,[path of plugins])
 AC_SUBST(PACKAGE_PLUGINS_DIR)
 
-PACKAGE_DATA_DIR="$prefix/share"
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
+PACKAGE_DATA_DIR="$datadir/mediastreamer/"
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ["$PACKAGE_DATA_DIR"] ,[path of data])
 AC_SUBST(PACKAGE_DATA_DIR)
 
 dnl check for video4linux headers

=== modified file 'help/Makefile.am'
--- help/Makefile.am	2010-06-11 05:06:49 +0000
+++ help/Makefile.am	2010-06-11 05:30:42 +0000
@@ -6,10 +6,7 @@
 
 SOURCES=$(top_srcdir)/include/mediastreamer2/*.h $(top_srcdir)/src/*.c $(top_srcdir)/src/*.h
 
-# doxdir & pkgdocdir are not always defined by automake
-docdir=$(datadir)/doc
-pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION)
-doc_htmldir=$(pkgdocdir)/html
+doc_htmldir=$(docdir)/html
 
 doc_html_DATA = $(top_builddir)/help/doc/html/html.tar
 
@@ -29,4 +26,4 @@
 endif
 
 clean-local:
-	rm -rf doc
\ No newline at end of file
+	rm -rf doc

=== modified file 'mediastreamer.pc.in'
--- mediastreamer.pc.in	2010-06-11 05:06:49 +0000
+++ mediastreamer.pc.in	2010-06-11 09:34:33 +0000
@@ -3,6 +3,9 @@
 address@hidden@
 address@hidden@
 
address@hidden@
address@hidden@
+
 Name: mediastreamer 
 Description: A mediastreaming library for telephony applications
 Requires: ortp

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-06-11 05:06:49 +0000
+++ src/Makefile.am	2010-06-11 05:55:36 +0000
@@ -194,7 +194,7 @@
 
 AM_OBJCFLAGS=$(AM_CFLAGS)
 
-imgdir=$(datadir)/images/
+imgdir=$(PACKAGE_DATA_DIR)
 
 img_DATA=nowebcamCIF.jpg