~ chicken-core (chicken-5) e86c807a621466eded2d3ee0b9c596bfa243b5f4

commit e86c807a621466eded2d3ee0b9c596bfa243b5f4
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Fri Aug 6 21:15:54 2021 +0200
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Tue Aug 10 14:43:12 2021 +0200

    TARGET_SHARE_HOME should include "chicken".
    
    TARGET_SHARE_HOME differs from INSTALL_SHARE_HOME by not having PROGRAM_PREFIX and PROGRAM_SUFFIX applied
    (this is only necessary to distinguish multiple cross-chickens on the host), but
    The chicken-specific destination directory should still be included on the target.
    This patch also ensures "mac.r" is installed in the chicken-specific subdirectory of
    PREFIX/share, which was previously incorrect, as reported by Lassi Kortela.
    
    Signed-off-by: Peter Bex <peter@more-magic.net>

diff --git a/README b/README
index fe355887..61121977 100644
--- a/README
+++ b/README
@@ -349,10 +349,10 @@ _/        _/    _/    _/    _/        _/  _/    _/        _/    _/_/
 	    |   |   |-- chicken.png
 	    |   |   `-- *.html
 	    |   |-- CHICKEN.icns                      (Macintosh)
+	    |   |-- mac.r                             (Macintosh)
 	    |   |-- chicken.rc.o                      (Windows)
 	    |   |-- feathers.tcl
 	    |   `-- setup.defaults
-	    |-- mac.r                                 (Macintosh)
 	    `-- man
 		`-- man1
 		    |-- chicken-install.1
diff --git a/defaults.make b/defaults.make
index 36461445..ef3edee6 100644
--- a/defaults.make
+++ b/defaults.make
@@ -458,7 +458,7 @@ else
 endif
 	$(call echo, >>, $@,#endif)
 	$(call echo, >>, $@,#ifndef C_TARGET_SHARE_HOME)
-	$(call echo, >>, $@,# define C_TARGET_SHARE_HOME "$(TARGET_PREFIX)/share")
+	$(call echo, >>, $@,# define C_TARGET_SHARE_HOME "$(TARGET_PREFIX)/share/chicken")
 	$(call echo, >>, $@,#endif)
 	$(call echo, >>, $@,#ifndef C_TARGET_INCLUDE_HOME)
 	$(call echo, >>, $@,# define C_TARGET_INCLUDE_HOME "$(TARGET_PREFIX)/include/chicken")
diff --git a/rules.make b/rules.make
index eba0dcde..303755d3 100644
--- a/rules.make
+++ b/rules.make
@@ -307,7 +307,7 @@ endif
 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken.h "$(DESTDIR)$(ICHICKENINCDIR)"
 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(CHICKEN_CONFIG_H) "$(DESTDIR)$(ICHICKENINCDIR)"
 ifeq ($(PLATFORM),macosx)
-	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)mac.r "$(DESTDIR)$(ISHAREDIR)"
+	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)mac.r "$(DESTDIR)$(IDATADIR)"
 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)CHICKEN.icns "$(DESTDIR)$(IDATADIR)"
 endif
 ifdef WINDOWS