From 5333ab2a4b2e054527a1e8409ccd22e65c72155b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 13 Dec 2011 17:48:28 +0000
Subject: [PATCH] switch --adms3 over to the new adms3va directories

---
 ChangeLog                                   | 5 +++++
 autogen.sh                                  | 4 ++--
 src/spicelib/devices/adms/admst/ngspice.xml | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d3f0f9e8..94fc56832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Robert Larice
+ * autogen.sh ,
+ * src/spicelib/devices/adms/admst/ngspice.xml :
+  switch --adms3 over to the new adms3va directories
+
 2011-12-13  Robert Larice
  * src/spicelib/devices/adms/hicum0/admsva/hicum0.va ,
  * src/spicelib/devices/adms/mextram/admsva/bjt504t.va ,
diff --git a/autogen.sh b/autogen.sh
index 979fad884..780bb9740 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -180,10 +180,10 @@ $znew
                         cd $ADMSDIR/$adms_dir
                         if [ "$ADMS" -eq 3 ]; then
                             $ADMSXML \
-                                -I admsva \
+                                -I adms3va \
                                 --create_makefile_am \
                                 -e ../admst/ngspice.xml \
-                                `ls admsva/*.va`
+                                `ls adms3va/*.va`
                         else
                             $ADMSXML `ls admsva/*.va` -Iadmsva -xv \
                                 -e ../admst/ngspiceVersion.xml \
diff --git a/src/spicelib/devices/adms/admst/ngspice.xml b/src/spicelib/devices/adms/admst/ngspice.xml
index 2e2c7afb9..17d2274b7 100644
--- a/src/spicelib/devices/adms/admst/ngspice.xml
+++ b/src/spicelib/devices/adms/admst/ngspice.xml
@@ -3248,8 +3248,8 @@ MAINTAINERCLEANFILES = Makefile.in
 	%acld.c %ask.c %itf.h %del.c %dest.c \\
 	%init.c %load.c %mask.c %mdel.c %mpar.c %par.c \\
         %pzld.c %setup.c %temp.c %trunc.c \\
-: \$(srcdir)/admsva/%.va \$(ADMSXMLINTERFACE)/premint.xml \$(ADMSXMLINTERFACE)/ngspice.xml
-	admsXml -I\$(srcdir) -I\$(srcdir)/admsva -f \$&lt; -e \$(ADMSXMLINTERFACE)/premint.xml
+: \$(srcdir)/adms3va/%.va \$(ADMSXMLINTERFACE)/premint.xml \$(ADMSXMLINTERFACE)/ngspice.xml
+	admsXml -I\$(srcdir) -I\$(srcdir)/adms3va -f \$&lt; -e \$(ADMSXMLINTERFACE)/premint.xml
 	admsXml -I\$(srcdir) -f mna.va -e \$(ADMSXMLINTERFACE)/ngspice.xml
 
 </admst:template>