--- a/Makefile.in	2018-10-31 21:12:16.856861967 +0100
+++ b/Makefile.in	2018-10-31 21:15:26.611628532 +0100
@@ -326,7 +326,7 @@
 
 pkgIndex.tcl-hand:
 	@(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
-	"load [list [file join $$dir $(PKG_LIB_FILE)]];\
+	"load $(PKG_LIB_FILE);\
          source [list [file join $$dir tdom.tcl]]"'\
 	) > pkgIndex.tcl
 
@@ -422,7 +422,7 @@
 #========================================================================
 
 install-lib-binaries: binaries
-	@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
+	@$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    if test "x$$stub" = "xstub"; then \
@@ -432,15 +432,15 @@
 		echo " $(RANLIB) $$p"; \
 		$(RANLIB) $$p; \
 	    fi; \
-	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \
 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
 		if test -f $$lib; then \
-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
 		fi; \
 	    fi; \
 	  fi; \
@@ -450,13 +450,13 @@
 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
 	    destp=`basename $$p`; \
-	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
+	    echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \
 	  fi; \
 	done
 	@if test "x$(SHARED_BUILD)" = "x1"; then \
-	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
+	    echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \
+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \
 	fi
 
 #========================================================================