Added "annotate" to the installation of sky130_ef_io, as this avoids
using the .magic.lef files from the skywater-pdk source, some of which
have errors due to having been built with an older version of magic.
Also corrected the custom LEF views for the two top level cells from the
FD library to change the LEF class from BLOCK to PAD.
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 0cfb0ff..6e69f2d 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -907,7 +907,7 @@
 	${STAGE} -source ${SKYWATER_LIBS_PATH} -target ${STAGING_PATH}/${SKY130A} \
 		-cdl %l/latest/cells/*/*.cdl ignore=topography compile-only \
 			sort=custom/scripts/sort_pdkfiles.py \
-		-lef %l/latest/cells/*/*.lef compile-only \
+		-lef %l/latest/cells/*/*.lef anno compile-only \
 			sort=custom/scripts/sort_pdkfiles.py \
 		-doc %l/latest/cells/*/*.pdf \
 		-lib %l/latest/timing/*.lib \
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef
index 6fad1b9..579dc09 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_gpio_ovtv2.lef
@@ -1,5 +1,5 @@
 MACRO sky130_fd_io__top_gpio_ovtv2
-  CLASS BLOCK ;
+  CLASS PAD ;
   FOREIGN sky130_fd_io__top_gpio_ovtv2 ;
   ORIGIN 0.400 0.735 ;
   SIZE 141.455 BY 201.490 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef
index deda14f..03fcde4 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_xres4v2.lef
@@ -1,5 +1,5 @@
 MACRO sky130_fd_io__top_xres4v2
-  CLASS BLOCK ;
+  CLASS PAD ;
   FOREIGN sky130_fd_io__top_xres4v2 ;
   ORIGIN 0.515 0.000 ;
   SIZE 76.135 BY 200.000 ;