Index: dirac-1.0.2/Makefile.in
--- dirac-1.0.2/Makefile.in.orig	2009-02-11 02:43:39.000000000 +0100
+++ dirac-1.0.2/Makefile.in	2010-10-09 09:54:51.000000000 +0200
@@ -74,8 +74,7 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest \
-	libdirac_encoder libdirac_decoder encoder decoder util \
-	unit_tests tests doc win32
+	libdirac_encoder libdirac_decoder
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -219,8 +218,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \
-          libdirac_decoder encoder decoder util $(CPPUNITTESTS_DIR) \
-          tests $(DOC_DIR) win32
+          libdirac_decoder
 
 @HAVE_DOXYGEN_FALSE@DOC_DIR = 
 @HAVE_DOXYGEN_TRUE@DOC_DIR = doc
Index: schroedinger-1.0.11/Makefile.in
--- schroedinger-1.0.11/Makefile.in.orig	2010-10-08 03:28:38.000000000 +0200
+++ schroedinger-1.0.11/Makefile.in	2010-10-09 09:54:51.000000000 +0200
@@ -290,7 +290,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = schroedinger doc tools testsuite
+SUBDIRS = schroedinger doc tools
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 DIST_SUBDIRS = schroedinger doc tools testsuite
 EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
Index: schroedinger-1.0.11/schroedinger.pc.in
--- schroedinger-1.0.11/schroedinger.pc.in.orig	2010-09-22 22:32:47.000000000 +0200
+++ schroedinger-1.0.11/schroedinger.pc.in	2010-10-09 09:55:06.000000000 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/schroedinger-@SCHRO_MAJORMINOR@
+includedir=@includedir@
 toolsdir=${exec_prefix}/bin
 
 
@@ -11,6 +11,5 @@
 Version: @VERSION@
 Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@
 Libs.private: @PTHREAD_LIBS@ @LIBM@
-Cflags: -I${includedir}
-
+Cflags: -I${includedir}/schroedinger -I${includedir}
 
Index: schroedinger-1.0.11/schroedinger/Makefile.in
--- schroedinger-1.0.11/schroedinger/Makefile.in.orig	2010-10-08 03:28:36.000000000 +0200
+++ schroedinger-1.0.11/schroedinger/Makefile.in	2010-10-09 09:54:51.000000000 +0200
@@ -254,7 +254,7 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-pkgincludedir = $(includedir)/schroedinger-@SCHRO_MAJORMINOR@/schroedinger
+pkgincludedir = $(includedir)/schroedinger
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
