From bb76e8eb6174d830cb9fd99576f8b3c6e4aeaeed Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@rand-family.com>
Date: Wed, 7 Aug 2019 22:25:17 -0400
Subject: [PATCH] Do link from the object directory and provide relative paths
 to the objects.  Seems like the linker does not like the long pathnames.

---
 make/tail.mk      | 7 +++++--
 pkg/createPackage | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/make/tail.mk b/make/tail.mk
index fa6fd26..a1690d3 100644
--- a/make/tail.mk
+++ b/make/tail.mk
@@ -120,11 +120,12 @@ ifeq ($(BINTARGET),)
 # then link the binary over that same file creating the resource fork first
 # and the data fork second.
 $(TARGETDIR)/$(PGM): $(BUILD_OBJS)
+	$(MKDIR) $(TARGETDIR)
 ifneq ($(REZ_OBJS),)
 	$(RM) $(TARGETDIR)/$(PGM)
 	$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
 endif
-	$(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(TARGETDIR)/$(PGM)
+	cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) --keep=$(TARGETDIR)/$(PGM)
 	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
 
     endif
@@ -135,6 +136,7 @@ endif
 # and the data fork second.
 
 $(TARGETDIR)/$(PGM): $(BUILD_OBJS) $(ASM_SRCS)
+	$(MKDIR) $(TARGETDIR)
 	$(RM) $(TARGETDIR)/$(PGM)
 	$(MERLIN_ASM) linkscript.s $(PGM) $(TARGETDIR)/$(PGM)
 ifneq ($(REZ_OBJS),)
@@ -152,7 +154,7 @@ else
 # resource compile will read the $(PGM).bin binary and load it into the
 # resources also.
 $(BINTARGET): $(BUILD_OBJS)
-	$(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(BINTARGET)
+	cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) --keep=$(BINTARGET)
 
     endif
 
@@ -169,6 +171,7 @@ $(BINTARGET): $(BUILD_OBJS) $(ASM_SRCS)
 $(REZ_OBJS): $(BINTARGET)
 
 $(TARGETDIR)/$(PGM): $(REZ_OBJS)
+	$(MKDIR) $(TARGETDIR)
 	$(RM) $(TARGETDIR)/$(PGM)
 	$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
 	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
diff --git a/pkg/createPackage b/pkg/createPackage
index 4a44f00..93f24fb 100755
--- a/pkg/createPackage
+++ b/pkg/createPackage
@@ -63,7 +63,7 @@ done < $PROJECTS
 
 rm -f $PROJECTS
 
-pkgbuild --root $TMPDIR --version 2.0.1 --identifier com.halcyontouch.Apple2gsTemplate.pkg --install-location /Library/Developer/Xcode/ --scripts pkg/scripts/ Apple2GSXcodeTemplate.pkg
+pkgbuild --root $TMPDIR --version 2.0.3 --identifier com.halcyontouch.Apple2gsTemplate.pkg --install-location /Library/Developer/Xcode/ --scripts pkg/scripts/ Apple2GSXcodeTemplate.pkg
 productbuild --distribution pkg/Distribution.xml --resource ./pkg temp.pkg
 rm Apple2GSXcodeTemplate.pkg
 productsign --sign "Developer ID Installer" temp.pkg Apple2GSXcodeTemplate.pkg