Minor cleanup after merging pull request #127 from Tim Ansell.
diff --git a/README.md b/README.md
index e5d34ae..8e94a55 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@
the need to declare an install target or run "make install". However, it is
recommended to declare a target location and install there, using
- ./configure --prefix=[/opt/pdks] --enable-[PDK_name]-pdk=[path]
+ ./configure --prefix=[path] --enable-[PDK_name]-pdk=[path]
followed by "make" and "make install".
diff --git a/common/staging_install.py b/common/staging_install.py
index e991058..fb67ead 100755
--- a/common/staging_install.py
+++ b/common/staging_install.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright 2020 Efabless Corporation
+# Copyright 2020 OpenCircuitDesign
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/docs.txt b/docs.txt
index 8683406..c2882b2 100644
--- a/docs.txt
+++ b/docs.txt
@@ -140,26 +140,26 @@
make Generate local staging area
sudo make install Install onto local system
- Which will install to /usr/local/share/pdks directory.
+ which will install to /usr/share/pdk directory.
Users can also elect to install somewhere by giving ./configure the
`--prefix` and other similar standard ./configure options.
For example;
- Installing to /usr/share/pdks;
+ Installing to /usr/local/share/pdk;
- ./configure --prefix=/usr
+ ./configure --prefix=/usr/local
make
sudo make install
- Installing to /opt/share/pdks;
+ Installing to /opt/share/pdk;
./configure --prefix=/opt
make
sudo make install
- Installing to ~/pdks;
+ Installing to ~/pdk;
./configure --prefix=$HOME --datarootdir=$HOME
make
@@ -169,16 +169,16 @@
is destined to be installed on other machines should set`--prefix`
to be the final install location and use `DESTDIR` with
`make install` to the directory where the files should be staged,
- see the following example;
+ see the following example:
./configure --prefix=/usr
make
- # Need to use sudo so the file end up with the right
+ # Need to use sudo so the file ends up with the right
# permissions.
sudo make DESTDIR=/tmp/package
(cd /tmp/package; tar -cvf ../dist.tar)
- Then on the final install machine you would want to do;
+ Then on the final install machine you would want to do:
(sudo cd /usr; tar -xvf dist.tar)
Prerequisites:
diff --git a/scripts/configure b/scripts/configure
index aed9348..f54abb5 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -585,6 +585,7 @@
PACKAGE_BUGREPORT='github.com/RTimothyEdwards/open_pdks'
PACKAGE_URL=''
+ac_default_prefix=/usr
ac_subst_vars='LTLIBOBJS
LIBOBJS
EF_STYLE
@@ -604,8 +605,6 @@
NETGEN_DISABLED
MAGIC_DISABLED
KLAYOUT_DISABLED
-SKY130_DIST_PATH
-SKY130_LOCAL_PATH
SKY130_SOURCE_PATH
SKY130_LINK_TARGETS
SED
@@ -637,7 +636,6 @@
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -720,7 +718,6 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -973,15 +970,6 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1119,7 +1107,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1272,7 +1260,6 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1802,6 +1789,7 @@
+
## REQUIRES: https://www.gnu.org/software/autoconf-archive/ax_python_module.html#ax_python_module
@@ -1844,7 +1832,7 @@
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -1925,7 +1913,7 @@
if ${am_cv_python_version+:} false; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"`
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
@@ -2197,8 +2185,6 @@
SKY130_SOURCE_PATH=""
- SKY130_LOCAL_PATH="${datadir}/pdk"
- SKY130_DIST_PATH=""
SKY130_LINK_TARGETS="none"
SKY130_AUTO="0"
@@ -2216,7 +2202,6 @@
fi
- # # Require this argument
if [ "$SKY130_SOURCE_PATH" != "" ]; then
SKY130_SOURCE_PATH=`realpath $SKY130_SOURCE_PATH`
@@ -2280,8 +2265,6 @@
-
-
# Set variables for tool setups
diff --git a/scripts/configure.ac b/scripts/configure.ac
index 5fdc3ef..244bd6c 100755
--- a/scripts/configure.ac
+++ b/scripts/configure.ac
@@ -1,5 +1,6 @@
AC_INIT([open_pdks], [1.0], [github.com/RTimothyEdwards/open_pdks])
+AC_PREFIX_DEFAULT(/usr)
AC_CONFIG_MACRO_DIR(m4)
## REQUIRES: https://www.gnu.org/software/autoconf-archive/ax_python_module.html#ax_python_module
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 6576f3c..514cb47 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -171,7 +171,7 @@
STAGING_PATH = $(shell pwd)/build
-SHARED_PDKS_PATH = $(datadir)/pdks
+SHARED_PDKS_PATH = $(datadir)/pdk
# If LINK_TARGETS is set to "none", then files are copied
# from the SkyWater sources to the target. If set to "source",
@@ -375,7 +375,7 @@
# copying or linking the foundry vendor files to the target directory.
STAGE = set -f ; ../common/foundry_install.py ${EF_FORMAT}
ifneq ($(DESTDIR), )
-INSTALL = ../common/staging_install.py -local $(DESTDIR)
+INSTALL = ../common/staging_install.py -local $(DESTDIR) ${EF_FORMAT}
else
INSTALL = ../common/staging_install.py ${EF_FORMAT}
endif
@@ -1153,11 +1153,11 @@
# Legacy name
${RM} ${SKY130A}_migrate.log
-# Old aliases for compatibility
-# -------------------------------------------------------------------------------------
+# Old aliases (retained for compatibility)
install-dist:
$(warning "'make install-dist' has been replaced with 'make install'")
make install
+
install-local:
$(warning "'make install-local' has been replaced with 'make install'")
make install
@@ -1165,6 +1165,7 @@
uninstall-dist:
$(warning "'make uninstall-dist' has been replaced with 'make uninstall'")
make uninstall
+
uninstall-local:
$(warning "'make uninstall-local' has been replaced with 'make uninstall'")
make uninstall
@@ -1172,6 +1173,7 @@
install-dist-a:
$(warning "'make install-dist-a' has been replaced with 'make install'")
make install
+
install-local-a:
$(warning "'make install-local-a' has been replaced with 'make install'")
make install
@@ -1179,6 +1181,7 @@
uninstall-dist-a:
$(warning "'make uninstall-dist-a' has been replaced with 'make uninstall'")
make uninstall
+
uninstall-local-a:
$(warning "'make uninstall-local-a' has been replaced with 'make uninstall'")
make uninstall
