Index: runtime/Makefile.am
--- runtime/Makefile.am.orig
+++ runtime/Makefile.am
@@ -37,7 +37,7 @@ libcsmith_a_SOURCES = \
 
 # XXX --- This does not work; the library is still installed to $(libdir).
 # libcsmith_a_libdir = \
-# 	$(libdir)/$(PACKAGE)-$(VERSION)
+# 	$(libdir)/$(PACKAGE)
 
 # Build a shared library, too, in case someone wants this.
 lib_LTLIBRARIES = libcsmith.la
@@ -49,7 +49,7 @@ libcsmith_la_CPPFLAGS = \
 	$(libcsmith_a_CPPFLAGS)
 
 libcsmith_a_includedir = \
-	$(includedir)/$(PACKAGE)-$(VERSION)
+	$(includedir)/$(PACKAGE)/runtime
 nobase_libcsmith_a_include_HEADERS = \
 	csmith.h \
 	csmith_minimal.h \