* whoops

diff --git a/Makefile.am b/Makefile.am
index 1998da5d1c16e16b859be3743b5015c79be66ff2..2c3c6609d5a3e8c6c30487ebad4863f9db5f8067 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -581,9 +581,9 @@ VLC-release.app: vlc
            cd ../../../; \
            cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
-         *darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
        esac
        rm -Rf $(top_builddir)/tmp
@@ -695,9 +695,9 @@ VLC.app: vlc
            cd ../../../; \
            cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
-         *darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
        esac
        rm -Rf $(top_builddir)/tmp

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index f24de7e281ada258b1292e2ffe7fb20d9d90a4de..4bfcb7a8b1c5a3a6695284107cf084d1bf7354e7 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1484,12 +1484,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)showExtended:(id)sender
 {
-    /* we need the wizard-nib for the bookmarks's extract functionality */
-    if (!nib_wizard_loaded)
-    {
-        nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
-    }
-
     if (!nib_extended_loaded)
     {
         nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
@@ -1502,6 +1496,12 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)showBookmarks:(id)sender
 {
+    /* we need the wizard-nib for the bookmarks's extract functionality */
+    if (!nib_wizard_loaded)
+    {
+        nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+    }
+    
     if (!nib_bookmarks_loaded)
     {
         nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];