← Back to branch summary

~ubuntu-branches/ubuntu/raring/tcl8.5/raring

« back to all changes in this revision

Viewing changes to debian/patches/tcllibrary.diff

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2011-12-20 18:16:54 UTC
  • mfrom: (11.2.3 sid)
  • Revision ID: package-import@ubuntu.com-20111220181654-ucrvquqz66e1dv80
Tags: 8.5.11-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Don't use tcl itself to install things when building, to allow for
    cross-building.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/tcllibrary.diff
1
 
--- tcl8.5-8.5.10.orig/unix/configure
2
 
+++ tcl8.5-8.5.10/unix/configure
3
 
@@ -18769,7 +18769,7 @@
4
 
 
5
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
6
 
 
7
 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
8
 
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
9
 
 PRIVATE_INCLUDE_DIR='$(includedir)'
10
 
 HTML_DIR='$(DISTDIR)/html'
11
 
 
12
 
--- tcl8.5-8.5.10.orig/unix/configure.in
13
 
+++ tcl8.5-8.5.10/unix/configure.in
14
 
@@ -736,7 +736,7 @@
15
 
 
16
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
17
 
 
18
 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
19
 
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
20
 
 PRIVATE_INCLUDE_DIR='$(includedir)'
21
 
 HTML_DIR='$(DISTDIR)/html'
22
 
 
23
 
--- tcl8.5-8.5.10.orig/library/init.tcl
24
 
+++ tcl8.5-8.5.10/library/init.tcl
 
1
--- tcl8.5-8.5.11.orig/unix/configure
 
2
+++ tcl8.5-8.5.11/unix/configure
 
3
@@ -18771,7 +18771,7 @@
 
4
 
 
5
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
6
 
 
7
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 
8
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 
9
 PRIVATE_INCLUDE_DIR='$(includedir)'
 
10
 HTML_DIR='$(DISTDIR)/html'
 
11
 
 
12
--- tcl8.5-8.5.11.orig/unix/configure.in
 
13
+++ tcl8.5-8.5.11/unix/configure.in
 
14
@@ -738,7 +738,7 @@
 
15
 
 
16
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
17
 
 
18
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 
19
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 
20
 PRIVATE_INCLUDE_DIR='$(includedir)'
 
21
 HTML_DIR='$(DISTDIR)/html'
 
22
 
 
23
--- tcl8.5-8.5.11.orig/library/init.tcl
 
24
+++ tcl8.5-8.5.11/library/init.tcl
25
25
@@ -46,7 +46,7 @@
26
26
 }
27
27
 namespace eval tcl {