From e915c0ebbc803c1cc3f35282f53fedffabaed6a3 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Thu, 9 Feb 2023 22:32:09 -0500 Subject: [PATCH] Fix submake so that parallel make will work --- .DS_Store | Bin 8196 -> 6148 bytes make/head.mk | 4 ++-- pkg/createPackage | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.DS_Store b/.DS_Store index 120dfc69a953cdcb55f34418815f59dc06e6c1e7..8c7855a4bc9677b1c9393f753206992b175e597d 100644 GIT binary patch delta 103 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jG}fU^g=(?`9r>namT*k`}Xb pa0oI36##(%H;`}zsohxkoq009j3-DZ0~5p)kiiU_<9X&V0{~|;5D5SP delta 213 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD6lbLH}hr%jz7$c**Q2SHn1=X zZ02E^$!yET5X9ih;K<;@;0vVn7;+g>80tK8@{^Nt@{>R&0L}djq-XpG10aimfrX)j zAr+{yU~(I~yfz1n2h?4_kj;>es+++YXaWaB_hucQN6cIj+(0v2L5|xj$nl+dGQWuD TWPctG4n~N(88*lB%wYxq_^mPQ diff --git a/make/head.mk b/make/head.mk index b176c59..986d2b8 100644 --- a/make/head.mk +++ b/make/head.mk @@ -120,6 +120,6 @@ XCODE_PLUGIN_COMPATIBILITY=DVTPlugInCompatibilityUUID all: $(MKDIR) $(OBJDIR) $(GENDIR) $(TARGETDIR) - @make -f $(firstword $(MAKEFILE_LIST)) gen - @make -f $(firstword $(MAKEFILE_LIST)) build + @$(MAKE) -f $(firstword $(MAKEFILE_LIST)) gen + @$(MAKE) -f $(firstword $(MAKEFILE_LIST)) build diff --git a/pkg/createPackage b/pkg/createPackage index 1bf44d9..d99e517 100755 --- a/pkg/createPackage +++ b/pkg/createPackage @@ -63,10 +63,10 @@ done < $PROJECTS rm -f $PROJECTS -pkgbuild --root $TMPDIR --version 3.0 --identifier com.halcyontouch.Apple2gsTemplate.pkg --install-location /tmp/com.halcyontouch.Apple2gsTemplate.pkg/ --scripts pkg/scripts/ Apple2GSXcodeTemplate.pkg +pkgbuild --root $TMPDIR --version 3.0.1 --identifier com.halcyontouch.Apple2gsTemplate.pkg --install-location /tmp/com.halcyontouch.Apple2gsTemplate.pkg/ --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 +productsign --sign "3rd Party Mac Developer Installer" temp.pkg Apple2GSXcodeTemplate.pkg rm temp.pkg rm -rf $TMPDIR