~ chicken-core (chicken-5) 9e6cba42b5e7f40723a004d678823d4e46c6aef5
commit 9e6cba42b5e7f40723a004d678823d4e46c6aef5
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Fri Jan 13 08:54:00 2017 +1300
Commit: Peter Bex <peter@more-magic.net>
CommitDate: Sun Jan 15 14:43:07 2017 +0100
Use Windows-aware BINDIR and DATADIR paths when installing feathers
Signed-off-by: Peter Bex <peter@more-magic.net>
diff --git a/rules.make b/rules.make
index 41bbacc9..e36cff8f 100644
--- a/rules.make
+++ b/rules.make
@@ -367,7 +367,7 @@ install-bin: $(TARGETS) install-libs install-dev
$(prog)$(EXE) "$(DESTDIR)$(IBINDIR)" $(NL))
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_DEBUGGER_PROGRAM) \
- "$(DESTDIR)$(BINDIR)" $(NL)
+ "$(DESTDIR)$(IBINDIR)"
ifdef STATICBUILD
$(foreach lib,$(IMPORT_LIBRARIES),\
@@ -423,7 +423,7 @@ install-other-files:
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)README "$(DESTDIR)$(IDOCDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)LICENSE "$(DESTDIR)$(IDOCDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)setup.defaults "$(DESTDIR)$(IDATADIR)"
- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)feathers.tcl "$(DESTDIR)$(DATADIR)"
+ $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)feathers.tcl "$(DESTDIR)$(IDATADIR)"
install-wrappers:
ifeq ($(WRAPPERDIR),)
Trap