Fix misc issues

Author: ychin

.github/actions/universal-package/action.yml

@@ -41,7 +41,7 @@ runs:
           # We also manually depend on GNU libiconv as Apple iconv is broken since macOS 14. This is necessary as MacVim
           # itself it built against it and we need both to match.
           sed -i.bak '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' ${formula}.rb
-          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] += " -I'$(brew --prefix)$'/opt/libiconv/lib"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] += " -I'$(brew --prefix)$'/opt/libiconv/include"\n' ${formula}.rb
           sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] += " -L'$(brew --prefix)$'/opt/libiconv/lib"\n' ${formula}.rb
         fi
 

.github/workflows/macvim-buildtest.yaml

@@ -89,7 +89,7 @@ jobs:
           xcode-select -p
           xcodebuild -version
 
-      # Set up, install, and cache libiconv library to work around broken Apple iconv since macOS 14.
+      # Set up, install, and cache GNU libiconv library to work around broken Apple iconv since macOS 14.
 
       - name: Set up libiconv
         if: inputs.publish
@@ -121,7 +121,6 @@ jobs:
 
       - name: Install packages
         run: |
-          # GNU iconv is installed to work around broken Apple iconv
           brew install --quiet libtool
 
       - name: Install packages for testing
@@ -233,7 +232,7 @@ jobs:
             sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
           fi
 
-          # Use Homebrew libiconv since Apple iconv is broken since macOS 14
+          # Use Homebrew GNU libiconv since Apple iconv has been broken since macOS 14
           sed -i.bak -f ci/config.mk.brew-libiconv.sed src/auto/config.mk
 
       - name: Modify configure result