From 323ce9598113a2d387a2cbd04eb2caa511560075 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Tue, 28 Jan 2020 12:17:22 -0500 Subject: [PATCH] Corrected missing references to the dist_dir install location in the top-level Makefile. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 23e22d4b..f0b50d48 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,8 @@ depend: database/database.h install: $(INSTALL_TARGET) install-magic: - @echo --- installing executable to $(DESTDIR)${BINDIR} - @echo --- installing runtime files to $(DESTDIR)${LIBDIR} + @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} + @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} @${MAKE} install-real 2>&1 >> install.log install-real: install-dirs @@ -77,16 +77,16 @@ install-real: install-dirs (cd $$dir && ${MAKE} install); done install-tcl-dirs: - ${MAGICDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \ - $(DESTDIR)${SYSDIR} $(DESTDIR)${TCLDIR} $(DESTDIR)${TCLDIR}/bitmaps + ${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} $(DESTDIR)${INSTALL_MANDIR} \ + $(DESTDIR)${SYSDIR} $(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/bitmaps install-dirs: - ${MAGICDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \ - $(DESTDIR)${SYSDIR} $(DESTDIR)${SCMDIR} + ${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} $(DESTDIR)${INSTALL_MANDIR} \ + $(DESTDIR)${INSTALL_SYSDIR} $(DESTDIR)${INSTALL_SCMDIR} install-tcl: - @echo --- installing executable to $(DESTDIR)${BINDIR} - @echo --- installing runtime files to $(DESTDIR)${LIBDIR} + @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} + @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} @${MAKE} install-tcl-real 2>&1 >> install.log install-tcl-real: install-tcl-dirs