Corrected the sky130 Makefile to put the special handling of the
GPIO cell with "insert_property.py" below the installation of the
library, or else the file to be modified won't be there. Corrected
a handful of places in the common scripts where "/bin/env" was used
instead of the more common "/usr/bin/env".
diff --git a/common/netlist_to_layout.py b/common/netlist_to_layout.py
index a3d9f51..0c228ef 100755
--- a/common/netlist_to_layout.py
+++ b/common/netlist_to_layout.py
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
#-----------------------------------------------------------------------
# netlist_to_layout.py
#-----------------------------------------------------------------------
diff --git a/common/split_gds.py b/common/split_gds.py
index 1a26ee6..31f4ac7 100755
--- a/common/split_gds.py
+++ b/common/split_gds.py
@@ -45,7 +45,7 @@
gdsfile = os.path.split(source)[1]
with open(destdir + '/split_gds.tcl', 'w') as ofile:
- print('#!/bin/env wish', file=ofile)
+ print('#!/usr/bin/env wish', file=ofile)
print('drc off', file=ofile)
print('gds readonly true', file=ofile)
print('gds rescale false', file=ofile)
diff --git a/common/split_one_spice.py b/common/split_one_spice.py
index 86a448a..be87d7a 100755
--- a/common/split_one_spice.py
+++ b/common/split_one_spice.py
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
#
# split_one_spice.py --
#
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 7870243..d0dd1dc 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -471,10 +471,6 @@
-gds %l/gds/*.gds \
-lef %l/lef/*.lef compile-only rename=sky130_ef_io \
-library general sky130_fd_io |& tee -a ${SKY130A}_install.log
- # Add a maskhint set for the GPIO pad .mag view to prevent problems writing
- # when writing HVI to GDS during hierarchical adjustments.
- ${ADDPROP} ${STAGING_PATH}/${SKY130A} sky130_fd_io sky130_fd_io__top_gpiov2 \
- "MASKHINTS_HVI 1346 17198 5828 19224 13700 1890 15920 2360 24 17522 1778 20612" -mag
# Install SkyWater I/O pad library
${STAGE} -source ${SKYWATER_PATH} -target ${STAGING_PATH}/${SKY130A} \
-spice %l/latest/cells/*/*.spice compile-only \
@@ -501,6 +497,10 @@
-gds %l/gds/*.gds \
-lef %l/lef/*.lef \
-library digital sky130_fd_sc_hd |& tee -a ${SKY130A}_install.log
+ # Add a maskhint set for the GPIO pad .mag view to prevent problems writing
+ # when writing HVI to GDS during hierarchical adjustments.
+ ${ADDPROP} ${STAGING_PATH}/${SKY130A} sky130_fd_io sky130_fd_io__top_gpiov2 \
+ "MASKHINTS_HVI 1346 17198 5828 19224 13700 1890 15920 2360 24 17522 1778 20612" -mag
# Install all SkyWater digital standard cells.
${STAGE} -source ${SKYWATER_PATH} -target ${STAGING_PATH}/${SKY130A} \
-techlef %l/latest/tech/*.tlef \
