- tar & release name change if tls is included

Makefile

@@ -107,7 +107,11 @@ export PREFIX LOCALBASE
 #export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
 #export INSTALL-TOUCH
 
-
+ifneq ($(TLS),)
+	tar_extra_args+=
+else
+	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
+endif
 # include the common rules
 include Makefile.rules
 
@@ -162,9 +166,9 @@ tar:
 		--exclude=$(notdir $(CURDIR))/test* \
 		--exclude=$(notdir $(CURDIR))/tmp* \
 		--exclude=$(notdir $(CURDIR))/debian/ser* \
-		--exclude=$(notdir $(CURDIR))/tls* \
 		--exclude=$(notdir $(CURDIR))/ser_tls* \
 		--exclude=CVS* \
+		--exclude=.cvsignore \
 		--exclude=*.[do] \
 		--exclude=*.so \
 		--exclude=*.il \
@@ -172,6 +176,10 @@ tar:
 		--exclude=*.gz \
 		--exclude=*.bz2 \
 		--exclude=*.tar \
+		--exclude=*.patch \
+		--exclude=.\#* \
+		--exclude=*.swp \
+		${tar_extra_args} \
 		-cf - $(notdir $(CURDIR)) | \
 			(mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \
 			    cd tmp/_tar1; $(TAR) -xf - ) && \

Makefile.defs

@@ -49,6 +49,9 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
 
 # TLS support
 TLS ?=
+ifneq ($(TLS),)
+	RELEASE:=$(RELEASE)-tls
+endif
 # extra CC command line options (e.g  -march=athlon-mp)
 CC_EXTRA_OPTS ?=
  # install location

TODO

@@ -2,6 +2,8 @@ $Id$
 
 ( - todo, x - done)
 
+- WARNING: tm fr_timer fixup is not in HEAD (should it be? is it the
+ rigth fix?)
 x update AUTHORS, debian/copyright, ser.8, ser.cfg.5 from stable
 x update Makefile*  from stable
 x update all package specs from stable