updated for version 7.1-122

diff --git a/src/main.aap b/src/main.aap
index b224058de7993990c38316a520be0114582fe15e..54debd60766ba2da38793ef902e65b9b4c02aa5e 100644 (file)
--- a/src/main.aap
+++ b/src/main.aap
@@ -56,9 +56,16 @@
     config {virtual} auto/config.h auto/config.aap :
                          auto/configure.aap configure.aap
                          config.arg config.h.in config.aap.in
+        # Use "uname -a" to detect the architecture of the system.
+        @ok, uname = redir_system('uname -a', 0)
+        @if string.find(uname, "i386") >= 0:
+        @   arch = "i386"
+        @else:
+        @   arch = "ppc"
+        :print Building for $arch system
         :sys CONFIG_STATUS=auto/config.status
                 ./configure.aap `file2string("config.arg")`
-                    --with-mac-arch=ppc
+                    --with-mac-arch=$arch
                     --cache-file=auto/config.cache
 
     # Configure arguments: create an empty "config.arg" file when its missing
@@ -1167,7 +1174,7 @@ install_macosx {virtual}: gui_bundle
         :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
 # TODO: Create the vimtutor application.
 
-gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info
+gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \
                         bundle-resource bundle-language
 
 bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
@@ -1187,7 +1194,7 @@ bundle-info {virtual}:  bundle-dir
         :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
 
 bundle-resource {virtual}: bundle-dir bundle-rsrc
-    :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
+        :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
 
 ### Classic resources
 # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)

diff --git a/src/version.c b/src/version.c
index aeeb316aa0f7b150a7ed2696ade3a1accd0b669d..21f538cdbb9c4e855b8758b8b675db3d19ff3f4b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    122,
 /**/
     121,
 /**/