Sfoglia il codice sorgente

pull in tcl-patch: fix Makefile to be compatible with standard make

Michael van Elst 22 anni fa
parent
commit
8e63afa279
2 ha cambiato i file con 26 aggiunte e 1 eliminazioni
  1. 23 0
      expect/expect.patch
  2. 3 1
      expect/expect.spec

+ 23 - 0
expect/expect.patch

@@ -0,0 +1,23 @@
+--- tcl8.4.4/unix/Makefile.in.dist	2003-07-22 10:32:06.000000000 +0200
++++ tcl8.4.4/unix/Makefile.in	2003-07-22 10:33:10.000000000 +0200
+@@ -1343,12 +1343,15 @@
+ # TOOL_DIR.
+ #
+ 
+-html-tcl: EXTRA_HTML_ARGS=--tcl
+-html-tk:  EXTRA_HTML_ARGS=--tk
+-
+-html html-tcl html-tk: 
++html:
++	$(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
++		--srcdir=$(TOP_DIR)/..
++html-tcl:
++	$(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
++		--srcdir=$(TOP_DIR)/.. --tcl
++html-tk:
+ 	$(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
+-		--srcdir=$(TOP_DIR)/.. $(EXTRA_HTML_ARGS)
++		--srcdir=$(TOP_DIR)/.. --tk
+ 
+ #
+ # Target to create a Macintosh version of the distribution.  This will

+ 3 - 1
expect/expect.spec

@@ -46,11 +46,12 @@ Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL
 Version:      %{V_expect}
-Release:      20030723
+Release:      20030730
 
 #   list of sources
 Source0:      http://expect.nist.gov/expect.tar.gz
 Source1:      ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tcl%{V_tcl}-src.tar.gz
+Patch0:       expect.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -69,6 +70,7 @@ AutoReqProv:  no
 %prep
     %setup0 -q -c -n expect-%{version}
     %setup1 -q -T -D -a 1
+    %patch0 -p0
 
 %build
     ( cd tcl%{V_tcl}/unix