diff options
Diffstat (limited to 'japanese/expect/files/patch-aa')
| -rw-r--r-- | japanese/expect/files/patch-aa | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa index dffab0d..5d763ec 100644 --- a/japanese/expect/files/patch-aa +++ b/japanese/expect/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.in.ORIG Fri Sep 25 15:07:28 1998 -+++ Makefile.in Fri Sep 25 15:31:01 1998 -@@ -30,7 +30,7 @@ +--- Makefile.in.ORIG Wed Oct 7 14:07:34 1998 ++++ Makefile.in Wed Oct 7 14:11:25 1998 +@@ -24,7 +24,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@ -@@ -38,7 +38,7 @@ +@@ -32,7 +32,7 @@ # Tk include files TKHDIRDASHI = @TKHDIRDASHI@ # Tk library @@ -18,7 +18,7 @@ TKLIB_INSTALLED = @TK_LIB_SPEC@ # X11 include files and other flags to compiler X11_CFLAGS = @TK_XINCLUDES@ -@@ -63,7 +63,7 @@ +@@ -57,7 +57,7 @@ # your Expect scripts. # Note: On Linux systems which only have dynamic X libraries, the -g prevents # the linker from using them. So do not use -g on such systems. @@ -27,7 +27,7 @@ #XCFLAGS = @CFLAGS@ @EXP_CFLAGS@ @EXP_SHLIB_CFLAGS@ XCFLAGS = @CFLAGS@ @EXP_CFLAGS@ -@@ -174,7 +174,7 @@ +@@ -171,7 +171,7 @@ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 infodir = @infodir@ @@ -36,7 +36,7 @@ # Expect's utility script directories - arch-independent and arch-non- # independent. These correspond to the variables "exp_library" and -@@ -186,12 +186,13 @@ +@@ -183,12 +183,13 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -51,7 +51,7 @@ # These definitions are used by the "subdirs_do" target to pass # the compile flags down recursively. -@@ -202,6 +203,7 @@ +@@ -199,6 +200,7 @@ "HDEFS=$(HDEFS)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -59,7 +59,7 @@ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "LDFLAGS=$(LDFLAGS)" \ "RUNTEST=$(RUNTEST)" \ -@@ -217,9 +219,9 @@ +@@ -214,9 +216,9 @@ # These let the DejaGnu test suite run when DejaGnu isn't # installed yet, so run it from the srcdir and objdir. EXPECT = ` \ @@ -72,7 +72,7 @@ RUNTESTFLAGS = RUNTEST = ` \ -@@ -319,16 +321,16 @@ +@@ -316,16 +318,16 @@ $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \ fi @@ -93,7 +93,7 @@ # install Expect library # This is done before the install target because the libraries have to be -@@ -341,21 +343,25 @@ +@@ -338,21 +340,25 @@ # Local copy is pkgIndex rather than pkgIndex.tcl because pkgIndex.tcl.in # is too long for some filesystems, sigh. install_shared_lib: $(EXP_LIB_FILES) @@ -128,7 +128,7 @@ # Build Expect with TestCenter expect.tc: exp_main_exp.o $(OFILES) -@@ -368,13 +374,13 @@ +@@ -365,13 +371,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. @@ -149,7 +149,7 @@ # Build Expectk with TestCenter expectk.tc: exp_main_tk.o $(OFILES) -@@ -392,24 +398,24 @@ +@@ -389,24 +395,24 @@ # rule out for each file, sigh). $(EXP_SHARED_LIB_FILE): $(OFILES) -rm -f $(EXP_SHARED_LIB_FILE) @@ -184,7 +184,14 @@ # install Expect's public include files # $(INSTALL_DATA) expect_cf.h $(includedir) $(INSTALL_DATA) $(srcdir)/expect.h $(includedir) -@@ -430,15 +432,10 @@ +@@ -421,21 +427,16 @@ + TCL_LIBRARY=$(TCL_LIBRARY) ; \ + export TCL_LIBRARY ; \ + if $(LOCAL_EXPECT) $(srcdir)/fixcat ; then \ +- $(INSTALL_DATA) $(srcdir)/fixcat $(EXECSCRIPTDIR)/cat-buffers ; \ ++ $(INSTALL_DATA) $(srcdir)/fixcat $(EXECSCRIPTDIR)/cat-buffers-jp ; \ + else true; fi + # install standalone scripts and their man pages, if requested ${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR) -for i in $(SCRIPT_LIST) ; do \ if [ -f $$i ] ; then \ @@ -201,25 +208,26 @@ $(SCRIPT_LIST): TCL_LIBRARY=$(TCL_LIBRARY) ; \ -@@ -448,14 +445,11 @@ +@@ -445,27 +446,21 @@ # 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 \ -- $(libdir)/$(EXP_SHARED_LIB_FILE) \ + -rm -f $(bindir)/expectkjp \ -+ $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) \ + $(libdir)/$(EXP_SHARED_LIB_FILE) \ $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) \ -- $(libdir)/$(EXP_UNSHARED_LIB_FILE) \ + $(libdir)/$(EXP_UNSHARED_LIB_FILE) \ $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) \ + $(libdir)/pkgIndex.tcl \ - $(man3dir)/libexpect.3 \ -+ $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) \ $(includedir)/expect_cf.h \ $(includedir)/expect.h \ $(includedir)/expect_tcl.h \ -@@ -464,10 +458,7 @@ + $(includedir)/expect_comm.h \ +- $(EXECSCRIPTDIR)/cat-buffers ++ $(EXECSCRIPTDIR)/cat-buffers-jp # debugger is not removed, since other things could depend on it # remove standalone scripts and man pages -for i in $(SCRIPT_LIST) ; do \ @@ -231,7 +239,7 @@ done ################################### -@@ -514,7 +505,7 @@ +@@ -516,7 +511,7 @@ # delete all files from current directory that are created by "make" clean: -rm -rf *~ *.o shared core \ @@ -240,7 +248,7 @@ dumb exho devtty \ $(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \ $(SCRIPT_LIST) -@@ -530,7 +521,7 @@ +@@ -532,7 +527,7 @@ # because most people don't have to worry about them mostlyclean: -rm -rf *~ *.o shared core \ @@ -249,7 +257,7 @@ $(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) @$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS) -@@ -680,7 +671,7 @@ +@@ -684,7 +679,7 @@ expect-$(VERSION).tar.gz: expect-$(VERSION).tar gzip -fc expect-$(VERSION).tar > $@ @@ -258,7 +266,7 @@ rm -f .tmp echo "set objdir" `pwd` > .tmp if [ "$(srcdir)" = "." ] ; then \ -@@ -690,7 +681,7 @@ +@@ -694,7 +689,7 @@ echo "source all" >> .tmp rootme=`pwd`; export rootme; \ srcdir=${srcdir} ; export srcdir ; \ |
