From f20fc63567151eaea3121f96c9921441914cb928 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sun, 15 Jan 2006 19:26:08 +0000
Subject: Fix OSX make and install stuff.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 fluid/Makefile                      |  7 ++--
 fluid/fluid.app/Contents/Info.plist | 68 +++++++++++++++++++++++++++++++++++++
 fluid/fluid.app/Contents/PkgInfo    |  1 +
 fluid/fluid.app/Info.plist          | 68 -------------------------------------
 fluid/fluid.app/PkgInfo             |  1 -
 5 files changed, 73 insertions(+), 72 deletions(-)
 create mode 100644 fluid/fluid.app/Contents/Info.plist
 create mode 100644 fluid/fluid.app/Contents/PkgInfo
 delete mode 100644 fluid/fluid.app/Info.plist
 delete mode 100644 fluid/fluid.app/PkgInfo

(limited to 'fluid')

diff --git a/fluid/Makefile b/fluid/Makefile
index 5f112c60f..92eba552a 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -59,6 +59,7 @@ fluid$(EXEEXT):		$(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
 	echo Linking $@...
 	$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
+	$(CP) $@ fluid.app/Contents/MacOS
 
 fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
 			../src/$(IMGDSONAME)
@@ -98,13 +99,13 @@ install-linux:
 
 install-osx:
 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app
-	$(CP) fluid.plist $(DESTDIR)/Applications/fluid.app/Info.plist
-	$(CP) fluid.info $(DESTDIR)/Applications/fluid.app/PkgInfo
 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents
+	$(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist
+	$(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo
 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS
 	$(LN) $(bindir)/fluid $(DESTDIR)/Application/fluid.app/Contents/MacOS/fluid
 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources
-	$(CP) icons/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources
+	$(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources
 
 uninstall:
 	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
diff --git a/fluid/fluid.app/Contents/Info.plist b/fluid/fluid.app/Contents/Info.plist
new file mode 100644
index 000000000..73bbfd657
--- /dev/null
+++ b/fluid/fluid.app/Contents/Info.plist
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="0.9">
+    <dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleExecutable</key>
+	<string>fluid</string>
+
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.fluid</string>
+
+	<key>CFBundleVersion</key>
+	<string>1.1.7</string>
+
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 1998-2006 by Bill Spitzak and others</string>
+
+	<key>CFAppleHelpAnchor</key>
+	<string>help</string>
+
+	<key>CFBundleName</key>
+	<string>FLUID</string>
+
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+
+	<key>CFBundleSignature</key>
+	<string>FLID</string>
+
+	<key>CFBundleIconFile</key>
+	<string>fluid.icns</string>
+
+	<key>CFBundleShortVersionString</key>
+	<string>1.1.7</string>
+
+	<key>CFBundleGetInfoString</key>
+	<string>1.1.7, Copyright 1998-2006 by Bill Spitzak and others</string>
+
+	<key>CFBundleDocumentTypes</key>
+	<array>
+            <dict>
+        	<key>CFBundleTypeExtensions</key>
+        	<array>
+                    <string>fl</string>
+        	</array>
+
+        	<key>CFBundleTypeIconFile</key>
+        	<string>fluid.icns</string>
+
+        	<key>CFBundleTypeName</key>
+        	<string>FLUID Designer File</string>
+
+        	<key>CFBundleTypeOSTypes</key>
+        	<array>
+                    <string>Flid</string>
+        	</array>
+
+        	<key>CFBundleTypeRole</key>
+        	<string>Editor</string>
+            </dict>
+	</array>
+
+    </dict>
+</plist>
diff --git a/fluid/fluid.app/Contents/PkgInfo b/fluid/fluid.app/Contents/PkgInfo
new file mode 100644
index 000000000..c5f93635d
--- /dev/null
+++ b/fluid/fluid.app/Contents/PkgInfo
@@ -0,0 +1 @@
+FLIDFlid
diff --git a/fluid/fluid.app/Info.plist b/fluid/fluid.app/Info.plist
deleted file mode 100644
index 73bbfd657..000000000
--- a/fluid/fluid.app/Info.plist
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist version="0.9">
-    <dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-
-	<key>CFBundleExecutable</key>
-	<string>fluid</string>
-
-	<key>CFBundleIdentifier</key>
-	<string>org.fltk.fluid</string>
-
-	<key>CFBundleVersion</key>
-	<string>1.1.7</string>
-
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 1998-2006 by Bill Spitzak and others</string>
-
-	<key>CFAppleHelpAnchor</key>
-	<string>help</string>
-
-	<key>CFBundleName</key>
-	<string>FLUID</string>
-
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-
-	<key>CFBundleSignature</key>
-	<string>FLID</string>
-
-	<key>CFBundleIconFile</key>
-	<string>fluid.icns</string>
-
-	<key>CFBundleShortVersionString</key>
-	<string>1.1.7</string>
-
-	<key>CFBundleGetInfoString</key>
-	<string>1.1.7, Copyright 1998-2006 by Bill Spitzak and others</string>
-
-	<key>CFBundleDocumentTypes</key>
-	<array>
-            <dict>
-        	<key>CFBundleTypeExtensions</key>
-        	<array>
-                    <string>fl</string>
-        	</array>
-
-        	<key>CFBundleTypeIconFile</key>
-        	<string>fluid.icns</string>
-
-        	<key>CFBundleTypeName</key>
-        	<string>FLUID Designer File</string>
-
-        	<key>CFBundleTypeOSTypes</key>
-        	<array>
-                    <string>Flid</string>
-        	</array>
-
-        	<key>CFBundleTypeRole</key>
-        	<string>Editor</string>
-            </dict>
-	</array>
-
-    </dict>
-</plist>
diff --git a/fluid/fluid.app/PkgInfo b/fluid/fluid.app/PkgInfo
deleted file mode 100644
index c5f93635d..000000000
--- a/fluid/fluid.app/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-FLIDFlid
-- 
cgit v1.2.3