diff --git a/netgen/Makefile b/netgen/Makefile index a9a49ea..52beff7 100644 --- a/netgen/Makefile +++ b/netgen/Makefile @@ -22,8 +22,8 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS} @echo --- making netgen Tcl library \(tclnetgen${SHDLIB_EXT}\) ${RM} tclnetgen${SHDLIB_EXT} ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \ - ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} \ - ${LIB_SPECS} ${LDFLAGS} + ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \ + -lc ${LIBS} ${LIB_SPECS} ${LDFLAGS} $(DESTDIR)${BINDIR}/netgen: ${RM} $@ diff --git a/scripts/configure.in b/scripts/configure.in index 6de4fb9..a72d2bf 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -868,7 +868,6 @@ case $target in AC_DEFINE(i386) ;; *darwin*) - AC_DEFINE(macosx) if test "$CPP" = "cc -E" ; then CPPFLAGS="$CPPFLAGS -no-cpp-precomp" fi diff --git a/tcltk/netgen.tcl.in b/tcltk/netgen.tcl.in index 03ba378..851299a 100644 --- a/tcltk/netgen.tcl.in +++ b/tcltk/netgen.tcl.in @@ -529,8 +529,13 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} { } else { # Match pins netgen::log echo off - set result [equate pins "$fnum1 [lindex $endval 0]" \ - "$fnum2 [lindex $endval 1]"] + if {$dolist == 1} { + set result [equate pins "$fnum1 [lindex $endval 0]" \ + "$fnum2 [lindex $endval 1]"] + } else { + set result [equate -list pins "$fnum1 [lindex $endval 0]" \ + "$fnum2 [lindex $endval 1]"] + } if {$result != 0} { equate classes "$fnum1 [lindex $endval 0]" \ "$fnum2 [lindex $endval 1]" diff --git a/tcltk/tclnetgen.c b/tcltk/tclnetgen.c index 3a23036..242aee6 100644 --- a/tcltk/tclnetgen.c +++ b/tcltk/tclnetgen.c @@ -4071,7 +4071,7 @@ int Tclnetgen_Init(Tcl_Interp *interp) if (cadroot == NULL) cadroot = CAD_DIR; Tcl_SetVar(interp, "CAD_ROOT", cadroot, TCL_GLOBAL_ONLY); - Tcl_PkgProvide(interp, "Tclnetgen", "1.1"); + Tcl_PkgProvide(interp, "Tclnetgen", NETGEN_VERSION); if ((consoleinterp = Tcl_GetMaster(interp)) == NULL) consoleinterp = interp;