diff --git a/qse/Makefile.am b/qse/Makefile.am
index 8ecc0f74..2fe39a9c 100644
--- a/qse/Makefile.am
+++ b/qse/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTION = foreign
 # EXTRA_DIST = 
 
 SUBDIRS = lib cmd
-DIST_SUBDIRS = $(__COREDIRS) include test
+DIST_SUBDIRS = $(SUBDIRS) include test
 
 install-data-hook:
 	cd include && $(MAKE) install
diff --git a/qse/Makefile.in b/qse/Makefile.in
index cbc614cb..d510caa1 100644
--- a/qse/Makefile.in
+++ b/qse/Makefile.in
@@ -193,7 +193,7 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTION = foreign
 # EXTRA_DIST = 
 SUBDIRS = lib cmd
-DIST_SUBDIRS = $(__COREDIRS) include test
+DIST_SUBDIRS = $(SUBDIRS) include test
 all: all-recursive
 
 .SUFFIXES:
diff --git a/qse/include/qse/Makefile.am b/qse/include/qse/Makefile.am
index eb91a452..1d99b23e 100644
--- a/qse/include/qse/Makefile.am
+++ b/qse/include/qse/Makefile.am
@@ -9,9 +9,9 @@ pkgincludedir= $(includedir)/qse
 CLEANFILES = *dist
 
 install-data-hook:
-	@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h" 
-	@"$(RM)" -f "$(pkgincludedir)/config.h.in"
-	@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h" 
+	@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h" 
+	@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h.in"
+	@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(DESTDIR)$(pkgincludedir)/types.h" 
 
 uninstall-hook:
-	@"$(RM)" -f "$(pkgincludedir)/config.h"
+	@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h"
diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in
index 2b3c1bec..27ff384b 100644
--- a/qse/include/qse/Makefile.in
+++ b/qse/include/qse/Makefile.in
@@ -551,12 +551,12 @@ uninstall-am: uninstall-pkgincludeHEADERS
 
 
 install-data-hook:
-	@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h" 
-	@"$(RM)" -f "$(pkgincludedir)/config.h.in"
-	@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(pkgincludedir)/types.h" 
+	@"$(GREP)" -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h" 
+	@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h.in"
+	@"$(SED)" 's|/\*#define QSE_HAVE_CONFIG_H\*/|#define QSE_HAVE_CONFIG_H|' "$(srcdir)/types.h" > "$(DESTDIR)$(pkgincludedir)/types.h" 
 
 uninstall-hook:
-	@"$(RM)" -f "$(pkgincludedir)/config.h"
+	@"$(RM)" -f "$(DESTDIR)$(pkgincludedir)/config.h"
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/qse/include/qse/awk/Makefile.am b/qse/include/qse/awk/Makefile.am
index e660cf01..ab194462 100644
--- a/qse/include/qse/awk/Makefile.am
+++ b/qse/include/qse/awk/Makefile.am
@@ -5,5 +5,5 @@ if ENABLE_CXX
 pkginclude_HEADERS += Awk.hpp StdAwk.hpp
 endif
 
-pkgincludedir= $(includedir)/qse/awk
+pkgincludedir = $(includedir)/qse/awk
 CLEANFILES = *dist
diff --git a/qse/include/qse/cmn/Makefile.am b/qse/include/qse/cmn/Makefile.am
index cddf3392..da6ce446 100644
--- a/qse/include/qse/cmn/Makefile.am
+++ b/qse/include/qse/cmn/Makefile.am
@@ -1,7 +1,7 @@
 
 pkginclude_HEADERS = mem.h chr.h str.h lda.h map.h rex.h sll.h dll.h opt.h fio.h pcp.h tio.h sio.h time.h
 
-pkgincludedir= $(includedir)/qse/cmn
+pkgincludedir = $(includedir)/qse/cmn
 
 CLEANFILES = *dist