Browse code

- tar & release name change if tls is included

Andrei Pelinescu-Onciul authored on 03/09/2003 17:14:29
Showing 3 changed files
... ...
@@ -107,7 +107,11 @@ export PREFIX LOCALBASE
107 107
 #export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
108 108
 #export INSTALL-TOUCH
109 109
 
110
-
110
+ifneq ($(TLS),)
111
+	tar_extra_args+=
112
+else
113
+	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
114
+endif
111 115
 # include the common rules
112 116
 include Makefile.rules
113 117
 
... ...
@@ -162,9 +166,9 @@ tar:
162 166
 		--exclude=$(notdir $(CURDIR))/test* \
163 167
 		--exclude=$(notdir $(CURDIR))/tmp* \
164 168
 		--exclude=$(notdir $(CURDIR))/debian/ser* \
165
-		--exclude=$(notdir $(CURDIR))/tls* \
166 169
 		--exclude=$(notdir $(CURDIR))/ser_tls* \
167 170
 		--exclude=CVS* \
171
+		--exclude=.cvsignore \
168 172
 		--exclude=*.[do] \
169 173
 		--exclude=*.so \
170 174
 		--exclude=*.il \
... ...
@@ -172,6 +176,10 @@ tar:
172 176
 		--exclude=*.gz \
173 177
 		--exclude=*.bz2 \
174 178
 		--exclude=*.tar \
179
+		--exclude=*.patch \
180
+		--exclude=.\#* \
181
+		--exclude=*.swp \
182
+		${tar_extra_args} \
175 183
 		-cf - $(notdir $(CURDIR)) | \
176 184
 			(mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \
177 185
 			    cd tmp/_tar1; $(TAR) -xf - ) && \
... ...
@@ -49,6 +49,9 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
49 49
 
50 50
 # TLS support
51 51
 TLS ?=
52
+ifneq ($(TLS),)
53
+	RELEASE:=$(RELEASE)-tls
54
+endif
52 55
 # extra CC command line options (e.g  -march=athlon-mp)
53 56
 CC_EXTRA_OPTS ?=
54 57
  # install location
... ...
@@ -2,6 +2,8 @@ $Id$
2 2
 
3 3
 ( - todo, x - done)
4 4
 
5
+- WARNING: tm fr_timer fixup is not in HEAD (should it be? is it the
6
+ rigth fix?)
5 7
 x update AUTHORS, debian/copyright, ser.8, ser.cfg.5 from stable
6 8
 x update Makefile*  from stable
7 9
 x update all package specs from stable