Update the previous commit to add loader_psths for subdirectories of

Frameworks, making sure that a loader_path for Frameworks is included even
if Frameworks doesn't exist.

Author: eliotmiranda

build.macos32x86/common/Makefile.app

@@ -167,9 +167,19 @@ $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
 	@mkdir -p $(APP)/Contents/Resources
 	cp -p $< $(APP)/Contents/Resources
 
+# Make sure that the executable contains a loader_path for Frameworks and all
+# its subdirectories. If Frameworks does not exist still add an rpath for it.
 pathapp:
 	install_name_tool -add_rpath @executable_path/../Frameworks $(VMEXE)
-	install_name_tool -add_rpath @loader_path/../Frameworks $(VMEXE)
+	if [ -d "$(APP)/Contents/Frameworks" ]; then \
+		for d in `cd "$(APP)/Contents" >/dev/null; find Frameworks -type d`; do \
+			echo install_name_tool -add_rpath @loader_path/../$$d $(VMEXE); \
+			install_name_tool -add_rpath @loader_path/../$$d $(VMEXE); \
+		done \
+	else \
+		echo install_name_tool -add_rpath @loader_path/../Frameworks $(VMEXE); \
+		install_name_tool -add_rpath @loader_path/../Frameworks $(VMEXE); \
+	fi
 
 # To sign the app, set SIGNING_IDENTITY in the environment, e.g.
 # export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda"

build.macos64x64/common/Makefile.app

@@ -167,9 +167,19 @@ $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
 	@mkdir -p $(APP)/Contents/Resources
 	cp -p $< $(APP)/Contents/Resources
 
+# Make sure that the executable contains a loader_path for Frameworks and all
+# its subdirectories. If Frameworks does not exist still add an rpath for it.
 pathapp:
 	install_name_tool -add_rpath @executable_path/../Frameworks $(VMEXE)
-	install_name_tool -add_rpath @loader_path/../Frameworks $(VMEXE)
+	if [ -d "$(APP)/Contents/Frameworks" ]; then \
+		for d in `cd "$(APP)/Contents" >/dev/null; find Frameworks -type d`; do \
+			echo install_name_tool -add_rpath @loader_path/../$$d $(VMEXE); \
+			install_name_tool -add_rpath @loader_path/../$$d $(VMEXE); \
+		done \
+	else \
+		echo install_name_tool -add_rpath @loader_path/../Frameworks $(VMEXE); \
+		install_name_tool -add_rpath @loader_path/../Frameworks $(VMEXE); \
+	fi
 
 # To sign the app, set SIGNING_IDENTITY in the environment, e.g.
 # export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda"