diff options
Diffstat (limited to 'japanese/expect/files/patch-aa')
| -rw-r--r-- | japanese/expect/files/patch-aa | 183 |
1 files changed, 126 insertions, 57 deletions
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa index 459a2bb7bd52..47b884b5a8d4 100644 --- a/japanese/expect/files/patch-aa +++ b/japanese/expect/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.in.ORIG Mon Mar 10 18:12:08 1997 -+++ Makefile.in Mon Mar 10 18:15:58 1997 -@@ -29,7 +29,7 @@ +--- Makefile.in.ORIG Fri Oct 17 10:44:20 1997 ++++ Makefile.in Fri Oct 17 10:45:10 1997 +@@ -30,7 +30,7 @@ TCL_LIBRARY = @TCL_LIBRARY@ # Tcl library uninstalled. Should be something like -ltcl or ../tcl/libtcl.a @@ -9,7 +9,7 @@ # Tcl library installed. Should be something like -ltcl or ../tcl/libtcl.a TCLLIB_INSTALLED = @TCL_LIB_SPEC@ -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ # Tk include files TKHDIRDASHI = @TKHDIRDASHI@ # Tk library @@ -18,16 +18,16 @@ TKLIB_INSTALLED = @TK_LIB_SPEC@ # X11 include files and other flags to compiler X11_CFLAGS = @TK_XINCLUDES@ -@@ -172,7 +172,7 @@ +@@ -174,7 +174,7 @@ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 infodir = @infodir@ -includedir = @includedir@ -+includedir = @includedir@/expect$(SHORT_VERSION) ++includedir = @includedir@/expect5.25jp # Expect's utility script directories - arch-independent and arch-non- # independent. These correspond to the variables "exp_library" and -@@ -184,12 +184,13 @@ +@@ -186,12 +186,13 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -42,7 +42,7 @@ # These definitions are used by the "subdirs_do" target to pass # the compile flags down recursively. -@@ -200,6 +201,7 @@ +@@ -202,6 +203,7 @@ "HDEFS=$(HDEFS)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -50,7 +50,7 @@ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "LDFLAGS=$(LDFLAGS)" \ "RUNTEST=$(RUNTEST)" \ -@@ -215,9 +217,9 @@ +@@ -217,9 +219,9 @@ # These let the DejaGnu test suite run when DejaGnu isn't # installed yet, so run it from the srcdir and objdir. EXPECT = ` \ @@ -63,76 +63,91 @@ RUNTESTFLAGS = RUNTEST = ` \ -@@ -317,16 +319,16 @@ +@@ -319,16 +321,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 +-all: expect $(EXP_LIB_FILES) ${X11_PROGS} ++all: expectjp $(EXP_LIB_FILES) ${X11_PROGS} @$(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) +-expect: exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) +- $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_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) ++expectjp: exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) ++ $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectjp exp_main_exp.o $(EXP_UNSHARED_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 @@ +@@ -350,12 +352,12 @@ + else true; fi + if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \ + $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \ +- $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \ ++ $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \ + else true; fi + +-expect_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib +- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS) +- $(SETUID) expect_installed ++expectjp_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib ++ $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectjp_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS) ++ $(SETUID) expectjp_installed + + # Build Expect with TestCenter + expect.tc: exp_main_exp.o $(OFILES) +@@ -368,13 +370,13 @@ # 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) +-expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) +- $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_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) +- +-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) +- $(SETUID) expectk_installed ++expectkjp: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) ++ $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectkjp exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) + $(SETUID) expectkjp ++ ++expectkjp_installed: exp_main_tk.o $(EXP_LIB_FILE) ++ $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectkjp_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) ++ $(SETUID) expectkjp_installed - 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 @@ + # Build Expectk with TestCenter + expectk.tc: exp_main_tk.o $(OFILES) +@@ -397,19 +399,14 @@ .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 expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) +- ${srcdir}/mkinstalldirs $(man1dir) $(man3dir) $(bindir) $(tcl_libdir) $(includedir) ++install: expectjp expectjp_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) ++ ${srcdir}/mkinstalldirs $(bindir) $(tcl_libdir) $(includedir) # install Expect - $(INSTALL_PROGRAM) expect_installed $(bindir)/expect -+ $(INSTALL_PROGRAM) expect_installed $(bindir)/expectjp ++ $(INSTALL_PROGRAM) expectjp_installed $(bindir)/expectjp # install Expectk (and man page) if present - -if [ -s expectk_installed ] ; then \ +- -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 ; \ +- $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \ ++ -if [ -s expectkjp_installed ] ; then \ ++ $(INSTALL_PROGRAM) expectkjp_installed $(bindir)/expectkjp ; \ else true; fi - # install Expect man page -@@ -442,7 +444,7 @@ +-# install Expect man page +- $(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1 +-# install man page for Expect and Expectk libraries +- $(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3 + # install Expect's public include files + # $(INSTALL_DATA) expect_cf.h $(includedir) + $(INSTALL_DATA) $(srcdir)/expect.h $(includedir) +@@ -430,15 +427,10 @@ ${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR) -for i in $(SCRIPT_LIST) ; do \ if [ -f $$i ] ; then \ @@ -141,21 +156,75 @@ rm -f $$i ; \ else true; fi ; \ done -@@ -539,7 +541,7 @@ +- -for i in $(SCRIPT_MANPAGE_LIST) ; do \ +- if [ -f $(srcdir)/example/$$i.man ] ; then \ +- $(INSTALL_DATA) $(srcdir)/example/$$i.man $(man1dir)/$$i.1 ; \ +- else true; fi ; \ +- done + + $(SCRIPT_LIST): + TCL_LIBRARY=$(TCL_LIBRARY) ; \ +@@ -448,14 +440,11 @@ + # 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 \ +- $(man1dir)/expect.1 \ +- $(man1dir)/expectk.1 \ ++ -rm -f $(bindir)/expectkjp \ + $(libdir)/$(EXP_SHARED_LIB_FILE) \ + $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) \ + $(libdir)/$(EXP_UNSHARED_LIB_FILE) \ + $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) \ +- $(man3dir)/libexpect.3 \ + $(includedir)/expect_cf.h \ + $(includedir)/expect.h \ + $(includedir)/expect_tcl.h \ +@@ -464,10 +453,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 ; \ +- done +- -for i in $(SCRIPT_MANPAGE_LIST) ; do \ +- rm -f $(man1dir)/$$i.1 ; \ ++ rm -f $(bindir_arch_indep)/$$i-jp ; \ + done + + ################################### +@@ -514,7 +500,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 \ ++ expectjp expectjp_installed expectkjp expectkjp_installed \ dumb exho devtty \ - $(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \ + $(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \ $(SCRIPT_LIST) -@@ -555,7 +557,7 @@ +@@ -530,7 +516,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) ++ expectjp expectjp_installed expectkjp expectkjp_installed \ + $(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) @$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS) +@@ -682,7 +668,7 @@ + expect-$(VERSION).tar.gz: expect-$(VERSION).tar + gzip -fc expect-$(VERSION).tar > $@ + +-test: expect ++test: expectjp + rm -f .tmp + echo "set objdir" `pwd` > .tmp + if [ "$(srcdir)" = "." ] ; then \ +@@ -692,7 +678,7 @@ + echo "source all" >> .tmp + rootme=`pwd`; export rootme; \ + srcdir=${srcdir} ; export srcdir ; \ +- if [ -f ./expect ] ; then \ ++ if [ -f ./expectjp ] ; then \ + TCL_LIBRARY=$(TCL_LIBRARY) ; \ + export TCL_LIBRARY ; fi ; \ + $(LOCAL_EXPECT) -f .tmp |