[qflow] 10/16: Modified scripts such that all TCL scripts are annotated with the correct path to "tclsh" on installation.

Ruben Undheim rubund-guest at moszumanska.debian.org
Thu Jul 23 08:22:47 UTC 2015


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to tag upstream/1.1.7
in repository qflow.

commit 19915e5e41e28af0d618cc1acf7226da12214e0d
Author: Tim Edwards <tim at opencircuitdesign.com>
Date:   Wed Jun 3 17:33:08 2015 -0400

    Modified scripts such that all TCL scripts are annotated with the
    correct path to "tclsh" on installation.
---
 config.log                                      | 40 +++++++++---------
 config.status                                   |  6 +--
 configure                                       | 43 +++++++++++--------
 configure.in                                    |  4 +-
 scripts/Makefile                                | 55 +++++++++++++++++++------
 scripts/Makefile.in                             | 53 +++++++++++++++++++-----
 scripts/{addspacers.tcl => addspacers.tcl.in}   |  2 +-
 scripts/{blif2cel.tcl => blif2cel.tcl.in}       |  2 +-
 scripts/{blif2sim.tcl => blif2sim.tcl.in}       |  2 +-
 scripts/{blifanno.tcl => blifanno.tcl.in}       |  2 +-
 scripts/{decongest.tcl => decongest.tcl.in}     |  2 +-
 scripts/{getfillcell.tcl => getfillcell.tcl.in} |  2 +-
 scripts/{place2def.tcl => place2def.tcl.in}     |  2 +-
 scripts/{place2def2.tcl => place2def2.tcl.in}   |  2 +-
 scripts/{place2lef2.tcl => place2lef2.tcl.in}   |  1 +
 scripts/{place2net2.tcl => place2net2.tcl.in}   |  2 +-
 scripts/{rtl2sim.tcl => rtl2sim.tcl.in}         |  2 +-
 scripts/{ybuffer.tcl => ybuffer.tcl.in}         |  2 +-
 scripts/{ypostproc.tcl => ypostproc.tcl.in}     |  2 +-
 src/Makefile                                    |  2 +-
 tech/Makefile                                   |  2 +-
 tech/osu035/Makefile                            |  2 +-
 tech/osu050/Makefile                            |  2 +-
 23 files changed, 152 insertions(+), 82 deletions(-)

diff --git a/config.log b/config.log
index 326024c..43e8fcd 100644
--- a/config.log
+++ b/config.log
@@ -181,22 +181,22 @@ configure:3638: checking for putenv
 configure:3638: gcc -o conftest -g -O2   conftest.c  >&5
 configure:3638: $? = 0
 configure:3638: result: yes
-configure:3707: checking for tclsh
-configure:3723: found /bin/tclsh
-configure:3734: result: tclsh
-configure:3807: checking for magic
-configure:3825: found /usr/local/bin/magic
-configure:3837: result: /usr/local/bin/magic
-configure:3910: checking for qrouter
-configure:3928: found /usr/local/bin/qrouter
-configure:3940: result: /usr/local/bin/qrouter
-configure:4013: checking for graywolf
-configure:4031: found /usr/local/bin/graywolf
-configure:4043: result: /usr/local/bin/graywolf
-configure:4116: checking for yosys
-configure:4134: found /usr/local/bin/yosys
-configure:4146: result: /usr/local/bin/yosys
-configure:4363: creating ./config.status
+configure:3710: checking for tclsh
+configure:3728: found /bin/tclsh
+configure:3741: result: /bin/tclsh
+configure:3814: checking for magic
+configure:3832: found /usr/local/bin/magic
+configure:3844: result: /usr/local/bin/magic
+configure:3917: checking for qrouter
+configure:3935: found /usr/local/bin/qrouter
+configure:3947: result: /usr/local/bin/qrouter
+configure:4020: checking for graywolf
+configure:4038: found /usr/local/bin/graywolf
+configure:4050: result: /usr/local/bin/graywolf
+configure:4123: checking for yosys
+configure:4141: found /usr/local/bin/yosys
+configure:4153: result: /usr/local/bin/yosys
+configure:4370: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -255,12 +255,12 @@ ac_cv_path_QFLOW_GRAYWOLF_PATH=/usr/local/bin/graywolf
 ac_cv_path_QFLOW_MAGIC_PATH=/usr/local/bin/magic
 ac_cv_path_QFLOW_QROUTER_PATH=/usr/local/bin/qrouter
 ac_cv_path_QFLOW_YOSYS_PATH=/usr/local/bin/yosys
+ac_cv_path_TCLSH_PATH=/bin/tclsh
 ac_cv_path_install='/bin/install -c'
 ac_cv_prog_AUTOCONF=autoconf
 ac_cv_prog_CP=cp
 ac_cv_prog_CPP='gcc -E'
 ac_cv_prog_RM=rm
-ac_cv_prog_TCLSH_PATH=tclsh
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_ac_ct_RANLIB=ranlib
 ac_cv_prog_cc_c89=
@@ -277,7 +277,7 @@ CFLAGS='-g -O2'
 CP='cp'
 CPP='gcc -E'
 CPPFLAGS=''
-DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"'
+DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"/bin/tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"'
 ECHO_C=''
 ECHO_N='-n'
 ECHO_T=''
@@ -311,7 +311,7 @@ RANLIB='ranlib'
 RM='rm'
 SHELL='/bin/sh'
 STDLIBS=''
-TCLSH_PATH='tclsh'
+TCLSH_PATH='/bin/tclsh'
 VERSION='1.1'
 ac_ct_CC='gcc'
 bindir='${exec_prefix}/bin'
@@ -362,7 +362,7 @@ target_alias=''
 #define STDC_HEADERS 1
 #define HAVE_SETENV 1
 #define HAVE_PUTENV 1
-#define TCLSH_PATH "tclsh"
+#define TCLSH_PATH "/bin/tclsh"
 #define QFLOW_MAGIC_PATH "/usr/local/bin/magic"
 #define QFLOW_QROUTER_PATH "/usr/local/bin/qrouter"
 #define QFLOW_GRAYWOLF_PATH "/usr/local/bin/graywolf"
diff --git a/config.status b/config.status
index 2b81828..32de38c 100755
--- a/config.status
+++ b/config.status
@@ -598,7 +598,7 @@ S["QFLOW_YOSYS_PATH"]="/usr/local/bin/yosys"
 S["QFLOW_GRAYWOLF_PATH"]="/usr/local/bin/graywolf"
 S["QFLOW_QROUTER_PATH"]="/usr/local/bin/qrouter"
 S["QFLOW_MAGIC_PATH"]="/usr/local/bin/magic"
-S["TCLSH_PATH"]="tclsh"
+S["TCLSH_PATH"]="/bin/tclsh"
 S["EGREP"]="/bin/grep -E"
 S["GREP"]="/bin/grep"
 S["RM"]="rm"
@@ -633,8 +633,8 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DSTDC_HEADERS=1"\
-" -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\\\"tclsh\\\" -DQFLOW_MAGIC_PATH=\\\"/usr/local/bin/magic\\\" -DQFLOW_QROUTER_PATH=\\\"/usr/local/bin/qrouter\\\" "\
-"-DQFLOW_GRAYWOLF_PATH=\\\"/usr/local/bin/graywolf\\\" -DQFLOW_YOSYS_PATH=\\\"/usr/local/bin/yosys\\\""
+" -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\\\"/bin/tclsh\\\" -DQFLOW_MAGIC_PATH=\\\"/usr/local/bin/magic\\\" -DQFLOW_QROUTER_PATH=\\\"/usr/local/bin/qrout"\
+"er\\\" -DQFLOW_GRAYWOLF_PATH=\\\"/usr/local/bin/graywolf\\\" -DQFLOW_YOSYS_PATH=\\\"/usr/local/bin/yosys\\\""
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
 S["libdir"]="${exec_prefix}/lib"
diff --git a/configure b/configure
index 4ef6947..5d712c0 100755
--- a/configure
+++ b/configure
@@ -3665,20 +3665,22 @@ if test "${with_tclsh+set}" = set; then :
 set dummy tclsh; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_TCLSH_PATH+:} false; then :
+if ${ac_cv_path_TCLSH_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$TCLSH_PATH"; then
-  ac_cv_prog_TCLSH_PATH="$TCLSH_PATH" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $TCLSH_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TCLSH_PATH="$TCLSH_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $TCLSH_DIR
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_TCLSH_PATH="tclsh"
+    ac_cv_path_TCLSH_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3686,10 +3688,11 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_TCLSH_PATH" && ac_cv_prog_TCLSH_PATH="$TCLSH_DIR"
-fi
+  test -z "$ac_cv_path_TCLSH_PATH" && ac_cv_path_TCLSH_PATH="tclsh"
+  ;;
+esac
 fi
-TCLSH_PATH=$ac_cv_prog_TCLSH_PATH
+TCLSH_PATH=$ac_cv_path_TCLSH_PATH
 if test -n "$TCLSH_PATH"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PATH" >&5
 $as_echo "$TCLSH_PATH" >&6; }
@@ -3706,20 +3709,22 @@ else
 set dummy tclsh; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_TCLSH_PATH+:} false; then :
+if ${ac_cv_path_TCLSH_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$TCLSH_PATH"; then
-  ac_cv_prog_TCLSH_PATH="$TCLSH_PATH" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $TCLSH_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TCLSH_PATH="$TCLSH_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_TCLSH_PATH="tclsh"
+    ac_cv_path_TCLSH_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3727,9 +3732,11 @@ done
   done
 IFS=$as_save_IFS
 
+  test -z "$ac_cv_path_TCLSH_PATH" && ac_cv_path_TCLSH_PATH="tclsh"
+  ;;
+esac
 fi
-fi
-TCLSH_PATH=$ac_cv_prog_TCLSH_PATH
+TCLSH_PATH=$ac_cv_path_TCLSH_PATH
 if test -n "$TCLSH_PATH"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PATH" >&5
 $as_echo "$TCLSH_PATH" >&6; }
diff --git a/configure.in b/configure.in
index 3e4cfcc..e53d520 100644
--- a/configure.in
+++ b/configure.in
@@ -47,9 +47,9 @@ AC_ARG_WITH(tclsh,
    else
       TCLSH_DIR=${PATH}
    fi
-   AC_CHECK_PROG(TCLSH_PATH, tclsh, tclsh, $TCLSH_DIR)
+   AC_PATH_PROG(TCLSH_PATH, tclsh, tclsh, $TCLSH_DIR)
 ], [
-   AC_CHECK_PROG(TCLSH_PATH, tclsh, tclsh, )])
+   AC_PATH_PROG(TCLSH_PATH, tclsh, tclsh, )])
 AC_DEFINE_UNQUOTED(TCLSH_PATH, "$TCLSH_PATH")
 
 dnl Path to Magic 8.0
diff --git a/scripts/Makefile b/scripts/Makefile
index ae68721..61357cd 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -4,7 +4,7 @@
 
 # Main compiler arguments
 CFLAGS = -g -O2
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"/bin/tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
 LIBS = 
 LDFLAGS = 
 INSTALL = /bin/install -c
@@ -13,6 +13,7 @@ VERSION = 1.1
 
 QFLOW_LIB_DIR = /usr/local/share/qflow
 QFLOW_BIN_DIR = /usr/local/bin
+TCLSH_PATH = /bin/tclsh
 
 DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
 
@@ -34,20 +35,50 @@ all:	$(MAIN_SCRIPT).in qflow.sh
 	$(MAKE) launcher
 
 launcher:  $(MAIN_SCRIPT).in
-		sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-		$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
+	sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+	$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
 
 checkdirs.sh:  checkdirs.sh.in
-		sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
-		-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-		-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
-		checkdirs.sh.in > checkdirs.sh
+	sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
+	-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+	-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
+	checkdirs.sh.in > checkdirs.sh
 
 qflow.sh:  qflow.sh.in
-		sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-		-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
-		-e '/QFLOW_VERSION/s#QFLOW_VERSION#$(VERSION)#' \
-		qflow.sh.in > qflow.sh
+	sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+	-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
+	-e '/QFLOW_VERSION/s#QFLOW_VERSION#$(VERSION)#' \
+	qflow.sh.in > qflow.sh
+
+blif2cel.tcl: blif2cel.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' blif2cel.tcl.in > $@
+
+place2def.tcl: place2def.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' place2def.tcl.in > $@
+
+place2lef2.tcl: place2def2.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' place2lef2.tcl.in > $@
+
+place2net2.tcl: place2net2.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' place2net2.tcl.in > $@
+
+ypostproc.tcl: ypostproc.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' ypostproc.tcl.in > $@
+
+ybuffer.tcl: ybuffer.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' ybuffer.tcl.in > $@
+
+decongest.tcl: decongest.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' decongest.tcl.in > $@
+
+addspacers.tcl: addspacers.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' addspacers.tcl.in > $@
+
+getfillcell.tcl: getfillcell.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' getfillcell.tcl.in > $@
+
+blifanno.tcl: blifanno.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' blifanno.tcl.in > $@
 
 install: $(TCL_SCRIPTS) $(SHELL_SCRIPTS) $(MAIN_SCRIPT)
 	@echo "Installing qflow scripts"
@@ -66,8 +97,8 @@ clean:
 	$(RM) $(MAIN_SCRIPT)
 	$(RM) checkdirs.sh
 	$(RM) qflow.sh
+	$(RM) $(TCL_SCRIPTS)
 
 uninstall:
 	$(RM) -rf ${SCRIPTINSTALL}
 	$(RM) ${EXECINSTALL}/${MAIN_SCRIPT}
-
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 119675f..9df7062 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -13,6 +13,7 @@ VERSION = @VERSION@
 
 QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
 QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
+TCLSH_PATH = @TCLSH_PATH@
 
 DEFAULTPARSER = @QFLOW_DEFAULT_PARSER@
 
@@ -34,20 +35,50 @@ all:	$(MAIN_SCRIPT).in qflow.sh
 	$(MAKE) launcher
 
 launcher:  $(MAIN_SCRIPT).in
-		sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-		$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
+	sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+	$(MAIN_SCRIPT).in > $(MAIN_SCRIPT)
 
 checkdirs.sh:  checkdirs.sh.in
-		sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
-		-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-		-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
-		checkdirs.sh.in > checkdirs.sh
+	sed -e '/SUBST_TECH_DIR/s#SUBST_TECH_DIR#$(TECHINSTALL)#' \
+	-e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+	-e '/SUBST_BIN_DIR/s#SUBST_BIN_DIR#$(QFLOWEXECPATH)#' \
+	checkdirs.sh.in > checkdirs.sh
 
 qflow.sh:  qflow.sh.in
-		sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-		-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
-		-e '/QFLOW_VERSION/s#QFLOW_VERSION#$(VERSION)#' \
-		qflow.sh.in > qflow.sh
+	sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
+	-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
+	-e '/QFLOW_VERSION/s#QFLOW_VERSION#$(VERSION)#' \
+	qflow.sh.in > qflow.sh
+
+blif2cel.tcl: blif2cel.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' blif2cel.tcl.in > $@
+
+place2def.tcl: place2def.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' place2def.tcl.in > $@
+
+place2lef2.tcl: place2def2.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' place2lef2.tcl.in > $@
+
+place2net2.tcl: place2net2.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' place2net2.tcl.in > $@
+
+ypostproc.tcl: ypostproc.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' ypostproc.tcl.in > $@
+
+ybuffer.tcl: ybuffer.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' ybuffer.tcl.in > $@
+
+decongest.tcl: decongest.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' decongest.tcl.in > $@
+
+addspacers.tcl: addspacers.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' addspacers.tcl.in > $@
+
+getfillcell.tcl: getfillcell.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' getfillcell.tcl.in > $@
+
+blifanno.tcl: blifanno.tcl.in
+	sed -e 's#TCLSH_PATH#$(TCLSH_PATH)#' blifanno.tcl.in > $@
 
 install: $(TCL_SCRIPTS) $(SHELL_SCRIPTS) $(MAIN_SCRIPT)
 	@echo "Installing qflow scripts"
@@ -66,8 +97,8 @@ clean:
 	$(RM) $(MAIN_SCRIPT)
 	$(RM) checkdirs.sh
 	$(RM) qflow.sh
+	$(RM) $(TCL_SCRIPTS)
 
 uninstall:
 	$(RM) -rf ${SCRIPTINSTALL}
 	$(RM) ${EXECINSTALL}/${MAIN_SCRIPT}
-
diff --git a/scripts/addspacers.tcl b/scripts/addspacers.tcl.in
similarity index 99%
rename from scripts/addspacers.tcl
rename to scripts/addspacers.tcl.in
index f0bbfbf..9d535ed 100755
--- a/scripts/addspacers.tcl
+++ b/scripts/addspacers.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # addspacers.tcl ---
 #
diff --git a/scripts/blif2cel.tcl b/scripts/blif2cel.tcl.in
similarity index 99%
rename from scripts/blif2cel.tcl
rename to scripts/blif2cel.tcl.in
index 5c4bd64..32a059f 100755
--- a/scripts/blif2cel.tcl
+++ b/scripts/blif2cel.tcl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/tclsh
+#!TCLSH_PATH
 #
 # Usage:
 #	blif2cel.tcl <blif_filename> <lef_filename> [<cel_filename>]
diff --git a/scripts/blif2sim.tcl b/scripts/blif2sim.tcl.in
similarity index 99%
rename from scripts/blif2sim.tcl
rename to scripts/blif2sim.tcl.in
index 8355934..f320ffa 100755
--- a/scripts/blif2sim.tcl
+++ b/scripts/blif2sim.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #
 # Usage:
 #	blif2sim.tcl <blif_filename> <dir> [<sim_filename>]
diff --git a/scripts/blifanno.tcl b/scripts/blifanno.tcl.in
similarity index 99%
rename from scripts/blifanno.tcl
rename to scripts/blifanno.tcl.in
index 6f29ab9..63c6bad 100755
--- a/scripts/blifanno.tcl
+++ b/scripts/blifanno.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # blifanno.tcl ---
 #
diff --git a/scripts/decongest.tcl b/scripts/decongest.tcl.in
similarity index 99%
rename from scripts/decongest.tcl
rename to scripts/decongest.tcl.in
index 5c34750..e9c0098 100755
--- a/scripts/decongest.tcl
+++ b/scripts/decongest.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #
 # Usage:
 #	decongest.tcl <rootname> <leffile> <fillcell> [<scale> <offset>]
diff --git a/scripts/getfillcell.tcl b/scripts/getfillcell.tcl.in
similarity index 99%
rename from scripts/getfillcell.tcl
rename to scripts/getfillcell.tcl.in
index fd86471..ff5fe1c 100755
--- a/scripts/getfillcell.tcl
+++ b/scripts/getfillcell.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # getfillcell.tcl ---
 #
diff --git a/scripts/place2def.tcl b/scripts/place2def.tcl.in
similarity index 99%
rename from scripts/place2def.tcl
rename to scripts/place2def.tcl.in
index d42cc7e..eb07f50 100755
--- a/scripts/place2def.tcl
+++ b/scripts/place2def.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # place2def.tcl ---
 #
diff --git a/scripts/place2def2.tcl b/scripts/place2def2.tcl.in
similarity index 99%
rename from scripts/place2def2.tcl
rename to scripts/place2def2.tcl.in
index 1e8e5f3..dfa11f2 100755
--- a/scripts/place2def2.tcl
+++ b/scripts/place2def2.tcl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/tclsh
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # place2def2.tcl <rootname> <lefname> ---
 #
diff --git a/scripts/place2lef2.tcl b/scripts/place2lef2.tcl.in
similarity index 99%
rename from scripts/place2lef2.tcl
rename to scripts/place2lef2.tcl.in
index b65f9fd..2d42186 100755
--- a/scripts/place2lef2.tcl
+++ b/scripts/place2lef2.tcl.in
@@ -1,3 +1,4 @@
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # place2lef2.tcl ---
 #
diff --git a/scripts/place2net2.tcl b/scripts/place2net2.tcl.in
similarity index 99%
rename from scripts/place2net2.tcl
rename to scripts/place2net2.tcl.in
index 78fe0ae..b9ac01d 100755
--- a/scripts/place2net2.tcl
+++ b/scripts/place2net2.tcl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/tclsh
+#!TCLSH_PATH
 #---------------------------------------------------------------------------
 # place2net2.tcl ---
 #
diff --git a/scripts/rtl2sim.tcl b/scripts/rtl2sim.tcl.in
similarity index 99%
rename from scripts/rtl2sim.tcl
rename to scripts/rtl2sim.tcl.in
index 419d555..c1fa5b1 100755
--- a/scripts/rtl2sim.tcl
+++ b/scripts/rtl2sim.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #
 # Usage:
 #	rtl2sim.tcl <verilog_rtl_filename> <dir> [<sim_filename>]
diff --git a/scripts/ybuffer.tcl b/scripts/ybuffer.tcl.in
similarity index 99%
rename from scripts/ybuffer.tcl
rename to scripts/ybuffer.tcl.in
index b323ed5..05b45a4 100755
--- a/scripts/ybuffer.tcl
+++ b/scripts/ybuffer.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #-------------------------------------------------------------------------
 # ybuffer --- post-process a mapped .blif file generated by yosys
 #
diff --git a/scripts/ypostproc.tcl b/scripts/ypostproc.tcl.in
similarity index 99%
rename from scripts/ypostproc.tcl
rename to scripts/ypostproc.tcl.in
index 0380fbc..6d817ad 100755
--- a/scripts/ypostproc.tcl
+++ b/scripts/ypostproc.tcl.in
@@ -1,4 +1,4 @@
-#!/bin/tclsh
+#!TCLSH_PATH
 #-------------------------------------------------------------------------
 # ypostproc --- post-process a mapped .blif file generated by yosys
 #
diff --git a/src/Makefile b/src/Makefile
index 380dcc3..bba426f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 
 # Main compiler arguments
 CFLAGS = -g -O2
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"/bin/tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
 LIBS = 
 LDFLAGS = 
 INSTALL = /bin/install -c
diff --git a/tech/Makefile b/tech/Makefile
index f847060..71d63a7 100644
--- a/tech/Makefile
+++ b/tech/Makefile
@@ -4,7 +4,7 @@
 
 # Main compiler arguments
 CFLAGS = -g -O2
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"/bin/tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
 LIBS = 
 LDFLAGS = 
 INSTALL = /bin/install -c
diff --git a/tech/osu035/Makefile b/tech/osu035/Makefile
index 49252af..54aac23 100644
--- a/tech/osu035/Makefile
+++ b/tech/osu035/Makefile
@@ -4,7 +4,7 @@
 
 # Main compiler arguments
 CFLAGS = -g -O2
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"/bin/tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
 LIBS = 
 LDFLAGS = 
 INSTALL = /bin/install -c
diff --git a/tech/osu050/Makefile b/tech/osu050/Makefile
index 6415a90..3bd585d 100644
--- a/tech/osu050/Makefile
+++ b/tech/osu050/Makefile
@@ -4,7 +4,7 @@
 
 # Main compiler arguments
 CFLAGS = -g -O2
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
+DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"/bin/tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\"
 LIBS = 
 LDFLAGS = 
 INSTALL = /bin/install -c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git



More information about the debian-science-commits mailing list