diff --git a/UnitTest++/Makefile.am b/UnitTest++/Makefile.am
index a512fca..62e246f 100644
--- a/UnitTest++/Makefile.am
+++ b/UnitTest++/Makefile.am
@@ -1,12 +1,13 @@
 lib_LTLIBRARIES = UnitTest++/libUnitTest++.la
-pkgincludedir = $(includedir)/UnitTest++/
+pkgincludedir = $(includedir)
+
 nobase_pkginclude_HEADERS = UnitTest++/AssertException.h UnitTest++/CheckMacros.h UnitTest++/Checks.h UnitTest++/CompositeTestReporter.h UnitTest++/Config.h UnitTest++/CurrentTest.h UnitTest++/DeferredTestReporter.h UnitTest++/DeferredTestResult.h UnitTest++/ExceptionMacros.h UnitTest++/ExecuteTest.h UnitTest++/HelperMacros.h UnitTest++/MemoryOutStream.h UnitTest++/ReportAssert.h UnitTest++/ReportAssertImpl.h UnitTest++/RequireMacros.h UnitTest++/RequiredCheckException.h UnitTest++/RequiredCheckTestReporter.h UnitTest++/Test.h UnitTest++/TestDetails.h UnitTest++/TestList.h UnitTest++/TestMacros.h UnitTest++/TestReporter.h UnitTest++/TestReporterStdout.h UnitTest++/TestResults.h UnitTest++/TestRunner.h UnitTest++/TestSuite.h UnitTest++/ThrowingTestReporter.h UnitTest++/TimeConstraint.h UnitTest++/TimeHelpers.h UnitTest++/UnitTest++.h UnitTest++/UnitTestPP.h UnitTest++/XmlTestReporter.h
 UnitTest___libUnitTest___la_SOURCES = UnitTest++/AssertException.cpp UnitTest++/Checks.cpp UnitTest++/CompositeTestReporter.cpp UnitTest++/CurrentTest.cpp UnitTest++/DeferredTestReporter.cpp UnitTest++/DeferredTestResult.cpp UnitTest++/MemoryOutStream.cpp UnitTest++/ReportAssert.cpp UnitTest++/RequiredCheckException.cpp UnitTest++/RequiredCheckTestReporter.cpp UnitTest++/Test.cpp UnitTest++/TestDetails.cpp UnitTest++/TestList.cpp UnitTest++/TestReporter.cpp UnitTest++/TestReporterStdout.cpp UnitTest++/TestResults.cpp UnitTest++/TestRunner.cpp UnitTest++/ThrowingTestReporter.cpp UnitTest++/TimeConstraint.cpp UnitTest++/XmlTestReporter.cpp
 
-if WINDOWS 
+if WINDOWS
 nobase_pkginclude_HEADERS += UnitTest++/Win32/TimeHelpers.h
 UnitTest___libUnitTest___la_SOURCES += UnitTest++/Win32/TimeHelpers.cpp
-else 
+else
 nobase_pkginclude_HEADERS += UnitTest++/Posix/SignalTranslator.h UnitTest++/Posix/TimeHelpers.h
 UnitTest___libUnitTest___la_SOURCES += UnitTest++/Posix/SignalTranslator.cpp UnitTest++/Posix/TimeHelpers.cpp
 endif
diff --git a/configure.ac b/configure.ac
index 001ced8..fbf92c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,14 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([UnitTest++.pc])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_SILENT_RULES([yes])
+
+AC_CANONICAL_HOST
+
+dnl Detect Windows, as it doesn't implement UNIX signals and requires special code
 AM_CONDITIONAL([WINDOWS],
-	  [test "${host#*mingw}" != "${host}" -o "${host#*msvc}" != "${host}"])
+               [test "${host//mingw/}" != "${host}" -o "${host//msvc/}" != "${host}"])
+
 LT_INIT()
 
 AC_SUBST([LIBUNITTEST_SO_VERSION], [1:6:0])