Commit acd6326b authored by Carsten Schoenert's avatar Carsten Schoenert

rebuild patch queue from patch-queue branch

added patches:
fixes/Makefile.am-add-sanity-checks-called-by-distcheck.patch
fixes/Makefile.am-add-targets-for-cleanup-and-uninstallation.patch
fixes/Makefile.am-add-variables-GRAPHIC-LYX-_FILES.patch
fixes/Makefile.am-adding-a-target-for-manual.html.patch
fixes/Makefile.am-adding-some-magic-for-installing.patch
fixes/Makefile.am-adjust-target-upload.patch
fixes/Makefile.am-adopt-LYX_USER_DIR-into-lyx-call.patch
fixes/Makefile.am-remove-non-portable-wildcard-calls.patch
fixes/Makefile.am-updating-target-manual.pdf.patch
fixes/configure.ac-adding-copyright-and-licensing-information.patch
fixes/configure.ac-adding-with-lyxuserdir-option.patch
fixes/configure.ac-update-information-how-to-create-configure.patch
fixes/configure.ac-update-lyx-binary-check.patch
fixes/spelling-fixing-misspelled-word-dependance.patch

All the patches on doc/{configure.ac,Makefile.am} are getting forwarded
to upstream.
parent d6796c33
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 18:01:50 +0100
Subject: Makefile.am: add copyright and license information
---
doc/Makefile.am | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index de78501..8e51a6c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,13 @@
+# Makefile.am for ngspice-doc
+#
+# Copyright (C) Holger Vogt
+# (C) 2018 Carsten Schoenert <c.schoenert@t-online.de>
+#
+# This file is part of the ngspice-doc. Please see README and COPYING for
+# terms of use.
+#
+# SPDX-License-Identifier: CC-BY-SA-4.0
+
## Additional targets that will be processed by the distcheck target.
installcheck-am: check-lyx-files check-png-files
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:53:10 +0100
Subject: Makefile.am: add sanity checks called by "distcheck'
Added two additional targets (check-lyx-files and check-png-files) that
will do both some sanity checks and are called from the target
'distcheck' that is usually called before 'make dist'.
Firsty both targets will check if every file that is listed in
{GRAPHIC,LYX}_FILES is also available for tarball creation and
documentation build later.
And secondly the targets will check if the folders are not containing
more files than listed in the variables. If some additional file is
found a Warning is printed out.
---
doc/Makefile.am | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d5e53a9..de78501 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,5 @@
+## Additional targets that will be processed by the distcheck target.
+installcheck-am: check-lyx-files check-png-files
# dist
EXTRA_DIST = manual.lyx Tables Images
@@ -78,6 +80,100 @@ install-html-am: manual.html
$(MKDIR_P) $(DESTDIR)$(docdir)/html || exit 1
cp -a -f $(top_builddir)/$(BUILD_HTML)/* $(DESTDIR)$(htmldir)/html
+## Some sanity checks for the LYX files.
+## This target will get called before 'distdir' is called, so its running before
+## any archive producing target (by the possible targets 'dist-*') is called.
+## See variable BUILT_SOURCES.
+check-lyx-files:
+ @echo -e "\nChecking availability of listed files in \$$(LYX_FILES)..."
+ @for file in $(LYX_FILES); do \
+ NOT_FOUND=0 ;\
+ if [ ! -f $${file} ]; then \
+ echo $${file} not found! ;\
+ NOT_FOUND=1 ;\
+ fi \
+ done ;\
+ if [ "$${NOT_FOUND}" -eq "1" ]; then \
+ echo "At least one file from \$$(LYX_FILES) could not be found!" ;\
+ else \
+ echo "All files found." ;\
+ fi
+ @echo -e "\nChecking for existing files that are *not* listed in \$$(LYX_FILES)..."
+ @FOUND_LYX_FILES=`find $(top_srcdir)/Tables -type f -name "*.lyx" | sort` ;\
+ ERROR=0 ;\
+ for entry in $${FOUND_LYX_FILES}; do \
+ FOUND_FILE=`basename $${entry}` ;\
+ echo "Checking $${FOUND_FILE} from $(top_srcdir)/Tables" ;\
+ for listed_lyx_file in $(LYX_FILES); do \
+ GIVEN_FILE=`basename $${listed_lyx_file}` ;\
+ FOUND=0 ;\
+ if [ "$${FOUND_FILE}" == "$${GIVEN_FILE}" ]; then \
+ FOUND=1 ;\
+ break ;\
+ fi ;\
+ done ;\
+ if [ "$${FOUND}" == "0" ]; then \
+ echo "Ooops! '$${entry}' not found in \$$(LYX_FILES)!" ;\
+ ERROR=1 ;\
+ fi ;\
+ done ;\
+ if [ "$${ERROR}" == "1" ]; then \
+ echo "" ;\
+ echo " WARNING!!!" ;\
+ echo " At least one '*.lyx' file was found in the folder '$(top_srcdir)/Tables' that is not added to \$$(LYX_FILES) in '$(top_srcdir)/Makefile.am'!" ;\
+ echo " You might have forgotten to add these files?" ;\
+ echo "" ;\
+ else \
+ echo "All files found." ;\
+ fi
+
+## Some sanity checks for the PNG files.
+## This target will get called before 'distdir' is called, so its running before
+## any archive producing target (by the possible targets 'dist-*') is called.
+## See variable BUILT_SOURCES.
+check-png-files:
+ @echo -e "\nChecking availability of listed files in \$$(GRAPHIC_FILES)..."
+ @for file in $(GRAPHIC_FILES); do \
+ NOT_FOUND=0 ;\
+ if [ ! -f $${file} ]; then \
+ echo $${file} not found! ;\
+ NOT_FOUND=1 ;\
+ fi \
+ done ;\
+ if [ "$${NOT_FOUND}" -eq "1" ]; then \
+ echo "At least one file from \$$(GRAPHICS_FILES) could not be found!" ;\
+ else \
+ echo "All files found." ;\
+ fi
+ @echo -e "\nChecking for existing files that are *not* listed in \$$(GRAPHICS_FILES)..."
+ @FOUND_GRAPHICS_FILES=`find $(top_srcdir)/Images -type f -name "*.png" | sort` ;\
+ ERROR=0 ;\
+ for entry in $${FOUND_GRAPHICS_FILES}; do \
+ FOUND_FILE=`basename $${entry}` ;\
+ echo "Checking $${FOUND_FILE} from $(top_srcdir)/Tables" ;\
+ for listed_lyx_file in $(GRAPHICS_FILES); do \
+ GIVEN_FILE=`basename $${listed_graphics_file}` ;\
+ FOUND=0 ;\
+ if [ "$${FOUND_FILE}" == "$${GIVEN_FILE}" ]; then \
+ FOUND=1 ;\
+ break ;\
+ fi ;\
+ done ;\
+ if [ "$${FOUND}" == "0" ]; then \
+ echo "Ooops! '$${entry}' not found in \$$(GRAPHICS_FILES)!" ;\
+ ERROR=1 ;\
+ fi ;\
+ done ;\
+ if [ "$${ERROR}" == "1" ]; then \
+ echo "" ;\
+ echo " WARNING!!!" ;\
+ echo " At least one '*.png' file was found in the folder '$(top_srcdir)/Images' that is not added to \$$(GRAPHICS_FILES) in '$(top_srcdir)/Makefile.am'!" ;\
+ echo " You might have forgotten to add these files?" ;\
+ echo "" ;\
+ else \
+ echo "All files found." ;\
+ fi
+
install-data-am: install-pdf-am install-html-am
uninstall-am:
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:44:47 +0100
Subject: Makefile.am: add targets for cleanup and uninstallation
Also an uninstallation is easy to add, and we need some clean up targets.
---
doc/Makefile.am | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a49a69a..c5bfc29 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,6 +29,15 @@ install-html-am: manual.html
install-data-am: install-pdf-am install-html-am
+uninstall-am:
+ rm -rf $(DESTDIR)$(docdir) $(DESTDIR)$(htmldir)
+
+clean-local:
+ rm -rf $(top_builddir)/$(BUILD_PDF)
+ rm -rf $(top_builddir)/$(BUILD_HTML)
+
+distclean-local: clean-local
+
upload:
chmod 664 manual.pdf
scp manual.pdf web.sourceforge.net:htdocs/docs
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:48:57 +0100
Subject: Makefile.am: add variables {GRAPHIC,LYX}_FILES
(Re-) adding the old $(lyx_fragments) variable split of in some more
variables. They will be used by later commits so we can check the
completeness of the required files.
---
doc/Makefile.am | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c5bfc29..d5e53a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,6 +4,57 @@ EXTRA_DIST = manual.lyx Tables Images
MAINTAINERCLEANFILES = manual.pdf
+## Needed PNG files for the documentation.
+GRAPHIC_FILES = \
+ $(top_srcdir)/Images/C4.png \
+ $(top_srcdir)/Images/C5.png \
+ $(top_srcdir)/Images/CIDER_Conc_profile1.png \
+ $(top_srcdir)/Images/CIDER_Conc_profile2.png \
+ $(top_srcdir)/Images/Example_Circuit_1.png \
+ $(top_srcdir)/Images/Example_Circuit_2.png \
+ $(top_srcdir)/Images/Example_Circuit_C1.png \
+ $(top_srcdir)/Images/Example_Circuit_C2.png \
+ $(top_srcdir)/Images/Example_Circuit_C3.png \
+ $(top_srcdir)/Images/fft_windows.png \
+ $(top_srcdir)/Images/Filter-IO.png \
+ $(top_srcdir)/Images/gnuplot-stat-an.png \
+ $(top_srcdir)/Images/mesh-3a.png \
+ $(top_srcdir)/Images/ng-win-out.png \
+ $(top_srcdir)/Images/ng-win-out-white.png \
+ $(top_srcdir)/Images/optim-speed.png \
+ $(top_srcdir)/Images/Subc-filter.png \
+ $(top_srcdir)/Images/vr2-trrandom.png \
+ $(top_srcdir)/Images/XSPICE-Toplevel.png
+
+## Needed LYX files for the documentation.
+LYX_FILES = \
+ $(top_srcdir)/Tables/ASRC.lyx \
+ $(top_srcdir)/Tables/BJT2.lyx \
+ $(top_srcdir)/Tables/BJT.lyx \
+ $(top_srcdir)/Tables/BSIM1.lyx \
+ $(top_srcdir)/Tables/BSIM2.lyx \
+ $(top_srcdir)/Tables/Capacitor.lyx \
+ $(top_srcdir)/Tables/CCCS.lyx \
+ $(top_srcdir)/Tables/CCVS.lyx \
+ $(top_srcdir)/Tables/CplLines.lyx \
+ $(top_srcdir)/Tables/Inductor.lyx \
+ $(top_srcdir)/Tables/Isource.lyx \
+ $(top_srcdir)/Tables/LTRA.lyx \
+ $(top_srcdir)/Tables/MOS1.lyx \
+ $(top_srcdir)/Tables/MOS2.lyx \
+ $(top_srcdir)/Tables/MOS3.lyx \
+ $(top_srcdir)/Tables/MOS6.lyx \
+ $(top_srcdir)/Tables/MOS9.lyx \
+ $(top_srcdir)/Tables/Mutual.lyx \
+ $(top_srcdir)/Tables/Resistor.lyx \
+ $(top_srcdir)/Tables/Tranline.lyx \
+ $(top_srcdir)/Tables/TransLine.lyx \
+ $(top_srcdir)/Tables/URC.lyx \
+ $(top_srcdir)/Tables/VBIC.lyx \
+ $(top_srcdir)/Tables/VCCS.lyx \
+ $(top_srcdir)/Tables/VCVS.lyx \
+ $(top_srcdir)/Tables/Vsource.lyx
+
BUILD_PDF = build_pdf
BUILD_HTML = build_html
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:37:03 +0100
Subject: Makefile.am: adding a target for manual.html
Let's build also some HTML based documentation, it's just some small
addition.
---
doc/Makefile.am | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e09a44c..56e0027 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,14 +7,20 @@ EXTRA_DIST = manual.lyx Tables Images
MAINTAINERCLEANFILES = manual.pdf
BUILD_PDF = build_pdf
+BUILD_HTML = build_html
-all: manual.pdf
+all: manual.pdf manual.html
manual.pdf:
@$(MKDIR_P) $(top_builddir)/$(BUILD_PDF) ;\
echo "building $(top_builddir)/$(BUILD_PDF)/manual.pdf" ;\
lyx -E pdf2 $(BUILD_PDF)/manual.pdf $(top_srcdir)/manual.lyx
+manual.html:
+ @$(MKDIR_P) $(top_builddir)/$(BUILD_HTML) ;\
+ echo "building $(top_builddir)/$(BUILD_HTML)/manual.xhtml" ;\
+ lyx -E xhtml $(BUILD_HTML)/manual.html $(top_srcdir)/manual.lyx
+
upload:
chmod 664 manual.pdf
scp manual.pdf web.sourceforge.net:htdocs/docs
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:39:50 +0100
Subject: Makefile.am: adding some magic for installing
As the autotools are providing quite all needed environment to get the
created documentation files installed within the correct folders we just
need a few more LOC to get this working magically.
By the prefix option of the configure script it can be controlled where
the installation will go through, e.g.
configure --prefix=/foo/bar
will install the file 'manual.pdf' into
/foo/bar/share/doc/ngspice-doc
and the HTML documentation into
/foo/bar/share/doc/ngspice-doc/html
---
doc/Makefile.am | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 56e0027..a49a69a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-# install and dist
-dist_doc_DATA = manual.pdf
# dist
EXTRA_DIST = manual.lyx Tables Images
@@ -21,6 +19,16 @@ manual.html:
echo "building $(top_builddir)/$(BUILD_HTML)/manual.xhtml" ;\
lyx -E xhtml $(BUILD_HTML)/manual.html $(top_srcdir)/manual.lyx
+install-pdf-am: manual.pdf
+ $(MKDIR_P) $(DESTDIR)$(docdir) || exit 1
+ cp -a -f $(top_builddir)/$(BUILD_PDF)/manual.pdf $(DESTDIR)$(docdir)
+
+install-html-am: manual.html
+ $(MKDIR_P) $(DESTDIR)$(docdir)/html || exit 1
+ cp -a -f $(top_builddir)/$(BUILD_HTML)/* $(DESTDIR)$(htmldir)/html
+
+install-data-am: install-pdf-am install-html-am
+
upload:
chmod 664 manual.pdf
scp manual.pdf web.sourceforge.net:htdocs/docs
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 18:06:16 +0100
Subject: Makefile.am: adjust target upload
Make the target 'upload' ready for out of tree build and modified
creation by the previous changes.
---
doc/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8e51a6c..e1e7828 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -196,6 +196,6 @@ clean-local:
distclean-local: clean-local
upload:
- chmod 664 manual.pdf
- scp manual.pdf web.sourceforge.net:htdocs/docs
+ chmod 664 $(top_builddir)/$(BUILD_PDF)/manual.pdf
+ scp $(top_builddir)/$(BUILD_PDF)/manual.pdf web.sourceforge.net:htdocs/docs
echo "ls -l htdocs/docs" | sftp web.sourceforge.net
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sun, 9 Dec 2018 17:05:31 +0100
Subject: Makefile.am: adopt $(LYX_USER_DIR) into lyx call
Make the configure option --with-lyxuserdir useable within the lyx
calls.
---
doc/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e1e7828..edaf9ec 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -75,12 +75,12 @@ all: manual.pdf manual.html
manual.pdf:
@$(MKDIR_P) $(top_builddir)/$(BUILD_PDF) ;\
echo "building $(top_builddir)/$(BUILD_PDF)/manual.pdf" ;\
- lyx -E pdf2 $(BUILD_PDF)/manual.pdf $(top_srcdir)/manual.lyx
+ lyx @LYX_USER_DIR@ -E pdf2 $(BUILD_PDF)/manual.pdf $(top_srcdir)/manual.lyx
manual.html:
@$(MKDIR_P) $(top_builddir)/$(BUILD_HTML) ;\
echo "building $(top_builddir)/$(BUILD_HTML)/manual.xhtml" ;\
- lyx -E xhtml $(BUILD_HTML)/manual.html $(top_srcdir)/manual.lyx
+ lyx @LYX_USER_DIR@ -E xhtml $(BUILD_HTML)/manual.html $(top_srcdir)/manual.lyx
install-pdf-am: manual.pdf
$(MKDIR_P) $(DESTDIR)$(docdir) || exit 1
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:27:11 +0100
Subject: Makefile.am: remove non portable wildcard calls
---
doc/Makefile.am | 5 -----
1 file changed, 5 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bf0dcf6..0e48e97 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,11 +6,6 @@ EXTRA_DIST = manual.lyx Tables Images
MAINTAINERCLEANFILES = manual.pdf
-lyx_fragments := \
- $(wildcard Tables/*.lyx) \
- $(wildcard Images/*.png) \
- $(wildcard Images/*.gif)
-
manual.pdf : manual.lyx $(lyx_fragments)
rm -f $@ ; lyx --export pdf2 $<
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:33:20 +0100
Subject: Makefile.am: updating target manual.pdf
Rework the old target 'manual.pdf' so it can also be build within a out
of tree build.
---
doc/Makefile.am | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0e48e97..e09a44c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,8 +6,14 @@ EXTRA_DIST = manual.lyx Tables Images
MAINTAINERCLEANFILES = manual.pdf
-manual.pdf : manual.lyx $(lyx_fragments)
- rm -f $@ ; lyx --export pdf2 $<
+BUILD_PDF = build_pdf
+
+all: manual.pdf
+
+manual.pdf:
+ @$(MKDIR_P) $(top_builddir)/$(BUILD_PDF) ;\
+ echo "building $(top_builddir)/$(BUILD_PDF)/manual.pdf" ;\
+ lyx -E pdf2 $(BUILD_PDF)/manual.pdf $(top_srcdir)/manual.lyx
upload:
chmod 664 manual.pdf
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:25:50 +0100
Subject: configure.ac: adding copyright and licensing information
---
doc/configure.ac | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/doc/configure.ac b/doc/configure.ac
index 406a5c8..a20a0f5 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -1,4 +1,14 @@
# -*- Autoconf -*-
+# configure.ac for ngspice-doc
+#
+# Copyright (C) Holger Vogt
+# (C) 2018 Carsten Schoenert <c.schoenert@t-online.de>
+#
+# This file is part of the ngspice-doc. Please see README and COPYING for
+# terms of use.
+#
+# SPDX-License-Identifier: CC-BY-SA-4.0
+
# Process this file with autoconf to produce a configure script.
# To regenerate the configure script call
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sun, 9 Dec 2018 17:00:45 +0100
Subject: configure.ac: adding --with-lyxuserdir option
In some circumstances it's needed to use a Lyx userdir which is outside
the typical user home directory, e.g. while building within a chroot or
while bootstraping. Adding a configure option '--with-lyxuserdir' so a
user can add a non standard Lyx user directory.
The usage is quite simple:
$ ./configure --with-lyxuserdir=/some/special/folder
---
doc/configure.ac | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/doc/configure.ac b/doc/configure.ac
index a20a0f5..2ee3e35 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -27,5 +27,22 @@ if test "x$LYX" != "xyes"; then
AC_MSG_ERROR([This package requires LyX!])
fi
+AC_ARG_WITH([lyxuserdir],
+ [AS_HELP_STRING([--with-lyxuserdir=DIR],
+ [use a dedicated Lyx user directory])],
+ [with_lyxuserdir="$withval"],
+ [with_lyxuserdir="no"])
+
+# If the user has given the option '--with-lyxuserdir' substitute the given
+# argument into the Makefile.
+if test "x$with_lyxuserdir" != "xno"; then
+ LYX_USER_DIR="-userdir $with_lyxuserdir"
+ AC_MSG_NOTICE([==> LYX_USER_DIR is configured to '$with_lyxuserdir'.])
+else
+ LYX_USER_DIR=""
+fi
+
+AC_SUBST([LYX_USER_DIR])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:20:41 +0100
Subject: configure.ac: update information how to create configure
There is no need to use the option -Wno-portability any more.
---
doc/configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/configure.ac b/doc/configure.ac
index 47a52ad..406a5c8 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -1,8 +1,8 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# To regenerate run:
-# autoreconf -Wno-portability
+# To regenerate the configure script call
+# autoreconf -vi
AC_INIT(ngspice-doc,29,[http://ngspice.sourceforge.net/bugrep.html])
AC_PREREQ(2.61)
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 8 Dec 2018 17:12:24 +0100
Subject: configure.ac: update lyx binary check
Recent autoconf versions can be picky on the required syntax for
the AC_CHECK_PROG() macro. All arguments should be placed within
square brackets.
---
doc/configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/configure.ac b/doc/configure.ac
index 786a97e..47a52ad 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -11,10 +11,10 @@ AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE
-AC_CHECK_PROG(lyx_found, lyx, [yes])
+AC_CHECK_PROG([LYX], lyx, [yes], [no], [$PATH])
-if test "$lyx_found" != "yes"; then
- AC_MSG_ERROR([this package requires LyX])
+if test "x$LYX" != "xyes"; then
+ AC_MSG_ERROR([This package requires LyX!])
fi
AC_CONFIG_FILES([Makefile])
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Mon, 10 Dec 2018 13:05:33 +0100
Subject: spelling: fixing misspelled word dependance
Small fix ups on wrong written word dependence.
---
src/spicelib/devices/adms/hicum0/admsva/hicum0.va | 2 +-
src/spicelib/devices/bsim4/b4.c | 2 +-
src/spicelib/devices/bsim4v6/b4v6.c | 2 +-
src/spicelib/devices/bsim4v7/b4v7.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/spicelib/devices/adms/hicum0/admsva/hicum0.va b/src/spicelib/devices/adms/hicum0/admsva/hicum0.va
index 76dc6de..90ad272 100644
--- a/src/spicelib/devices/adms/hicum0/admsva/hicum0.va
+++ b/src/spicelib/devices/adms/hicum0/admsva/hicum0.va
@@ -316,7 +316,7 @@ module hic0_full (c,b,e,s,tnode);
parameter real kf = 0.0 from [0:`INF) `P(spice:name="kf" info="flicker noise coefficient" unit="M^(1-AF)");
parameter real af = 2.0 from (0:10] `P(spice:name="af" info="flicker noise exponent factor");
-// Temperature dependance
+// Temperature dependence
parameter real vgb = 1.2 from (0:10] `P(spice:name="vgb" info="Bandgap-voltage" unit="V" test:value="1.17");
parameter real vge = 1.17 from (0:10] `P(spice:name="vge" info="Effective emitter bandgap-voltage" unit="V" test:value="1.07");
parameter real vgc = 1.17 from (0:10] `P(spice:name="vgc" info="Effective collector bandgap-voltage" unit="V" test:value="1.14");
diff --git a/src/spicelib/devices/bsim4/b4.c b/src/spicelib/devices/bsim4/b4.c
index d58ff67..dc12713 100644
--- a/src/spicelib/devices/bsim4/b4.c
+++ b/src/spicelib/devices/bsim4/b4.c
@@ -467,7 +467,7 @@ IOP( "jtssws", BSIM4_MOD_JTSSWS, IF_REAL, "Source STI sidewall trap-assisted sat
IOP( "jtsswd", BSIM4_MOD_JTSSWD, IF_REAL, "Drain STI sidewall trap-assisted saturation current density"),
IOP( "jtsswgs", BSIM4_MOD_JTSSWGS, IF_REAL, "Source gate-edge sidewall trap-assisted saturation current density"),
IOP( "jtsswgd", BSIM4_MOD_JTSSWGD, IF_REAL, "Drain gate-edge sidewall trap-assisted saturation current density"),
-IOP( "jtweff", BSIM4_MOD_JTWEFF, IF_REAL, "TAT current width dependance"),
+IOP( "jtweff", BSIM4_MOD_JTWEFF, IF_REAL, "TAT current width dependence"),
IOP( "njts", BSIM4_MOD_NJTS, IF_REAL, "Non-ideality factor for bottom junction"),
IOP( "njtssw", BSIM4_MOD_NJTSSW, IF_REAL, "Non-ideality factor for STI sidewall junction"),
IOP( "njtsswg", BSIM4_MOD_NJTSSWG, IF_REAL, "Non-ideality factor for gate-edge sidewall junction"),
diff --git a/src/spicelib/devices/bsim4v6/b4v6.c b/src/spicelib/devices/bsim4v6/b4v6.c
index 87c6b29..9853707 100644
--- a/src/spicelib/devices/bsim4v6/b4v6.c
+++ b/src/spicelib/devices/bsim4v6/b4v6.c
@@ -413,7 +413,7 @@ IOP( "jtssws", BSIM4v6_MOD_JTSSWS, IF_REAL, "Source STI sidewall trap-assisted s
IOP( "jtsswd", BSIM4v6_MOD_JTSSWD, IF_REAL, "Drain STI sidewall trap-assisted saturation current density"),
IOP( "jtsswgs", BSIM4v6_MOD_JTSSWGS, IF_REAL, "Source gate-edge sidewall trap-assisted saturation current density"),
IOP( "jtsswgd", BSIM4v6_MOD_JTSSWGD, IF_REAL, "Drain gate-edge sidewall trap-assisted saturation current density"),
-IOP( "jtweff", BSIM4v6_MOD_JTWEFF, IF_REAL, "TAT current width dependance"),
+IOP( "jtweff", BSIM4v6_MOD_JTWEFF, IF_REAL, "TAT current width dependence"),
IOP( "njts", BSIM4v6_MOD_NJTS, IF_REAL, "Non-ideality factor for bottom junction"),
IOP( "njtssw", BSIM4v6_MOD_NJTSSW, IF_REAL, "Non-ideality factor for STI sidewall junction"),
IOP( "njtsswg", BSIM4v6_MOD_NJTSSWG, IF_REAL, "Non-ideality factor for gate-edge sidewall junction"),
diff --git a/src/spicelib/devices/bsim4v7/b4v7.c b/src/spicelib/devices/bsim4v7/b4v7.c
index 4e175ca..a0bf0e4 100644
--- a/src/spicelib/devices/bsim4v7/b4v7.c
+++ b/src/spicelib/devices/bsim4v7/b4v7.c
@@ -430,7 +430,7 @@ IOP( "jtssws", BSIM4v7_MOD_JTSSWS, IF_REAL, "Source STI sidewall trap-assisted s
IOP( "jtsswd", BSIM4v7_MOD_JTSSWD, IF_REAL, "Drain STI sidewall trap-assisted saturation current density"),
IOP( "jtsswgs", BSIM4v7_MOD_JTSSWGS, IF_REAL, "Source gate-edge sidewall trap-assisted saturation current density"),
IOP( "jtsswgd", BSIM4v7_MOD_JTSSWGD, IF_REAL, "Drain gate-edge sidewall trap-assisted saturation current density"),
-IOP( "jtweff", BSIM4v7_MOD_JTWEFF, IF_REAL, "TAT current width dependance"),
+IOP( "jtweff", BSIM4v7_MOD_JTWEFF, IF_REAL, "TAT current width dependence"),
IOP( "njts", BSIM4v7_MOD_NJTS, IF_REAL, "Non-ideality factor for bottom junction"),
IOP( "njtssw", BSIM4v7_MOD_NJTSSW, IF_REAL, "Non-ideality factor for STI sidewall junction"),
IOP( "njtsswg", BSIM4v7_MOD_NJTSSWG, IF_REAL, "Non-ideality factor for gate-edge sidewall junction"),
fixes/spelling-fixing-some-misspelled-words.patch
fixes/spelling-fixing-more-misspelled-words.patch
fixes/spelling-fixing-misspelled-word-dependance.patch
fixes/configure.ac-update-lyx-binary-check.patch
fixes/configure.ac-update-information-how-to-create-configure.patch
fixes/configure.ac-adding-copyright-and-licensing-information.patch
fixes/Makefile.am-remove-non-portable-wildcard-calls.patch
fixes/Makefile.am-updating-target-manual.pdf.patch
fixes/Makefile.am-adding-a-target-for-manual.html.patch
fixes/Makefile.am-adding-some-magic-for-installing.patch
fixes/Makefile.am-add-targets-for-cleanup-and-uninstallation.patch
fixes/Makefile.am-add-variables-GRAPHIC-LYX-_FILES.patch
fixes/Makefile.am-add-sanity-checks-called-by-distcheck.patch
fixes/Makefile.am-add-copyright-and-license-information.patch
fixes/Makefile.am-adjust-target-upload.patch
fixes/configure.ac-adding-with-lyxuserdir-option.patch
fixes/Makefile.am-adopt-LYX_USER_DIR-into-lyx-call.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment