[Pkg-tcltk-commits] r523 - tcl8.5/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-02-25 07:34:09 +0000 (Mon, 25 Feb 2008)
New Revision: 523

Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * Quoted CFLAGS in debian/rules when passing to the shell, not when
    assigning to a make variable; otherwise the quotes end up as part of
    the variable and many things go wrong, leading to a build failure.
  * Cleaned up debian/rules.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2008-02-25 07:33:43 UTC (rev 522)
+++ tcl8.5/trunk/debian/changelog	2008-02-25 07:34:09 UTC (rev 523)
@@ -1,8 +1,11 @@
-tcl8.5 (8.5.1-2) UNRELEASED; urgency=low
+tcl8.5 (8.5.1-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Quoted CFLAGS in debian/rules when passing to the shell, not when
+    assigning to a make variable; otherwise the quotes end up as part of
+    the variable and many things go wrong, leading to a build failure.
+  * Cleaned up debian/rules.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat,  9 Feb 2008 01:23:50 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 25 Feb 2008 10:28:42 +0300
 
 tcl8.5 (8.5.1-1) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2008-02-25 07:33:43 UTC (rev 522)
+++ tcl8.5/trunk/debian/rules	2008-02-25 07:34:09 UTC (rev 523)
@@ -13,14 +13,14 @@
 v = 8.5
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS = "-g -O0"
+CFLAGS=-g -O0
 else
 # See bug #446335 for -fno-unit-at-a-time
 ifeq ($(DEB_HOST_ARCH), hppa)
 # Disable stack checking for hppa (it doesn't work properly yet)
-CFLAGS = "-g -O2 -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1"
+CFLAGS=-g -O2 -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1
 else
-CFLAGS = "-g -O2 -fno-unit-at-a-time"
+CFLAGS=-g -O2 -fno-unit-at-a-time
 endif
 endif
 
@@ -39,10 +39,10 @@
 build-stamp: patch-stamp
 	dh_testdir
 
-# so so ugly but it works...
+# So so ugly but it works...
 	touch generic/tclStubInit.c
 	cd unix && \
-	  TCL_LIBRARY="/usr/share/tcltk/tcl8.5" \
+	  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
 	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
 	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		      --build=$(DEB_BUILD_GNU_TYPE) \
@@ -55,7 +55,7 @@
 		      --enable-man-symlinks \
 		      --enable-man-compression=gzip && \
 	  touch ../generic/tclStubInit.c && \
-	  $(MAKE) CFLAGS=$(CFLAGS)
+	  $(MAKE) CFLAGS="$(CFLAGS)"
 
 # Build the static library.
 	cd unix && \
@@ -87,7 +87,8 @@
 	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
 		  MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
 		  MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
-	  	  TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" install
+		  TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" \
+		  install
 # Fix up the libraries.
 	cp unix/libtcl$(v).a debian/tmp/usr/lib
 	#mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0
@@ -110,11 +111,11 @@
 	  for f in *.[3n].gz ; do \
 	     f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
 	     if [ -L $$f ]; then \
-	        l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
-	        rm $$f ; \
-	        ln -sf $$l $$f2 ; \
+		l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
+		rm $$f ; \
+		ln -sf $$l $$f2 ; \
 	     else \
-	     	zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
+		zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
 			       -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
 			       -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
 			       -e 's/send(n)/send(3tk)/g' \
@@ -124,7 +125,7 @@
 			       -e 's/(n)/(3tcl)/g' \
 			       -e "s/\\N'244'/\\[^o]/g" \
 			 | gzip -9 >$$f2 ; \
-	        rm $$f ; \
+		rm $$f ; \
 	     fi ; \
 	  done