--- Makefile.in.ORIG	Mon Mar 10 18:12:08 1997
+++ Makefile.in	Mon Mar 10 18:15:58 1997
@@ -29,7 +29,7 @@
 TCL_LIBRARY = @TCL_LIBRARY@
 
 # Tcl library uninstalled.  Should be something like -ltcl or ../tcl/libtcl.a
-TCLLIB = @TCL_BUILD_LIB_SPEC@
+TCLLIB = @TCL_LIB_SPEC@
 # Tcl library installed.  Should be something like -ltcl or ../tcl/libtcl.a
 TCLLIB_INSTALLED = @TCL_LIB_SPEC@
 
@@ -37,7 +37,7 @@
 # Tk include files
 TKHDIRDASHI = @TKHDIRDASHI@
 # Tk library
-TKLIB = @TK_BUILD_LIB_SPEC@
+TKLIB = @TK_LIB_SPEC@
 TKLIB_INSTALLED = @TK_LIB_SPEC@
 # X11 include files and other flags to compiler
 X11_CFLAGS = @TK_XINCLUDES@
@@ -172,7 +172,7 @@
 man1dir = $(mandir)/man1
 man3dir = $(mandir)/man3
 infodir = @infodir@
-includedir = @includedir@
+includedir = @includedir@/expect$(SHORT_VERSION)
 
 # Expect's utility script directories - arch-independent and arch-non-
 # independent.  These correspond to the variables "exp_library" and
@@ -184,12 +184,13 @@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 AR = ar
 ARFLAGS = cr
 
-LOCAL_EXPECT=LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ./expect
+LOCAL_EXPECT=LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ./expectjp
 
 # These definitions are used by the "subdirs_do" target to pass
 # the compile flags down recursively.
@@ -200,6 +201,7 @@
 	"HDEFS=$(HDEFS)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"RUNTEST=$(RUNTEST)" \
@@ -215,9 +217,9 @@
 # These let the DejaGnu test suite run when DejaGnu isn't 
 # installed yet, so run it from the srcdir and objdir.
 EXPECT = ` \
-  if [ -f $${rootme}/expect ] ; then \
-    echo $${rootme}/expect ; \
-  else echo expect ; fi`
+  if [ -f $${rootme}/expectjp ] ; then \
+    echo $${rootme}/expectjp ; \
+  else echo expectjp ; fi`
 
 RUNTESTFLAGS =
 RUNTEST = ` \
@@ -317,16 +319,16 @@
 	   $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \
 	fi
 
-all: expect $(EXP_LIB_FILES) ${X11_PROGS} pkgIndex.tcl
+all: expectjp $(EXP_LIB_FILES) ${X11_PROGS} pkgIndex.tcl
 	@$(MAKE) subdir_do DO=$@  $(FLAGS_TO_PASS)
 
 info:
 dvi:
 
 # build expect binary that does not depend on Expect's shared libs
-expect:	exp_main_exp.o $(EXP_NONSHARED_LIB_FILE)
-	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_NONSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
-	$(SETUID) expect
+expectjp: exp_main_exp.o $(EXP_NONSHARED_LIB_FILE)
+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectjp exp_main_exp.o $(EXP_NONSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
+	$(SETUID) expectjp
 
 # install Expect library
 # This is done before the install target because the libraries have to be
@@ -356,9 +358,9 @@
 # together.  I could fix it by testing all the libraries (again, in Expect's
 # configure) separately for Expectk, but as far as I know, it doesn't hurt
 # anything here, so I'm not worrying about it.
-expectk: exp_main_tk.o $(EXP_NONSHARED_LIB_FILE)
-	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_NONSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-	$(SETUID) expectk
+expectkjp: exp_main_tk.o $(EXP_NONSHARED_LIB_FILE)
+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectkjp exp_main_tk.o $(EXP_NONSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
+	$(SETUID) expectkjp
 
 expectk_installed: exp_main_tk.o $(EXP_LIB_FILE)
 	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
@@ -385,7 +387,7 @@
 # Delete all the installed files that the `install' target creates
 # (but not the noninstalled files such as `make all' creates)
 uninstall:
-	-rm -f  $(bindir)/expectk \
+	-rm -f  $(bindir)/expectkjp \
 		$(man1dir)/expect.1 \
 		$(man1dir)/expectk.1 \
 		$(libdir)/$(EXP_SHARED_LIB_FILE) \
@@ -400,7 +402,7 @@
 # debugger is not removed, since other things could depend on it
 # remove standalone scripts and man pages
 	-for i in $(SCRIPT_LIST) ; do \
-	  rm -f $(bindir_arch_indep)/$$i ; \
+	  rm -f $(bindir_arch_indep)/$$i-jp ; \
 	done
 	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
 	  rm -f $(man1dir)/$$i.1 ; \
@@ -409,13 +411,13 @@
 .PHONY: install-info install info
 install-info:
 
-install:	expect expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) pkgIndex.tcl
+install:	expectjp expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) pkgIndex.tcl
 	${srcdir}/mkinstalldirs $(man1dir) $(man3dir) $(bindir) $(libdir) $(includedir)
 # install Expect
-	$(INSTALL_PROGRAM) expect_installed $(bindir)/expect
+	$(INSTALL_PROGRAM) expect_installed $(bindir)/expectjp
 # install Expectk (and man page) if present
 	-if [ -s expectk_installed ] ; then \
-	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectk ; \
+	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectkjp ; \
 	  $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
 	else true; fi
 # install Expect man page
@@ -442,7 +444,7 @@
 	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
 	-for i in $(SCRIPT_LIST) ; do \
 	  if [ -f $$i ] ; then \
-	    $(INSTALL_PROGRAM) $$i $(bindir_arch_indep)/$$i ; \
+	    $(INSTALL_SCRIPT) $$i $(bindir_arch_indep)/$$i-jp ; \
 	    rm -f $$i ; \
 	  else true; fi ; \
 	done
@@ -539,7 +541,7 @@
 # delete all files from current directory that are created by "make"
 clean:
 	-rm -rf *~ *.o shared core \
-		expect expect_installed expectk expectk_installed \
+		expectjp expect_installed expectkjp expectk_installed \
 		dumb exho devtty \
 		$(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
 		$(SCRIPT_LIST)
@@ -555,7 +557,7 @@
 # because most people don't have to worry about them
 mostlyclean:
 	-rm -rf *~ *.o shared core \
-		expect expect_installed expectk expectk_installed \
+		expectjp expect_installed expectkjp expectk_installed \
 		$(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
 	@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)