diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-01-15 19:26:08 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-01-15 19:26:08 +0000 |
| commit | f20fc63567151eaea3121f96c9921441914cb928 (patch) | |
| tree | 4c3cf3c30b3692399ea65a1468f56b85d11f5544 | |
| parent | d4713f59c50c3e81174e3885019dda6c53aa5fa0 (diff) | |
Fix OSX make and install stuff.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/Makefile | 7 | ||||
| -rw-r--r-- | fluid/fluid.app/Contents/Info.plist (renamed from fluid/fluid.app/Info.plist) | 0 | ||||
| -rw-r--r-- | fluid/fluid.app/Contents/PkgInfo (renamed from fluid/fluid.app/PkgInfo) | 0 |
3 files changed, 4 insertions, 3 deletions
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/Info.plist b/fluid/fluid.app/Contents/Info.plist index 73bbfd657..73bbfd657 100644 --- a/fluid/fluid.app/Info.plist +++ b/fluid/fluid.app/Contents/Info.plist diff --git a/fluid/fluid.app/PkgInfo b/fluid/fluid.app/Contents/PkgInfo index c5f93635d..c5f93635d 100644 --- a/fluid/fluid.app/PkgInfo +++ b/fluid/fluid.app/Contents/PkgInfo |