Skip to content

Commit fac0183

Browse files
committed
Move VERSIONS file into archive root to prevent directory squashing on unpacking.
1 parent 76d6f7e commit fac0183

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Makefile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PYTHON_VERSION=3.7.0
3434
PYTHON_VER=$(basename $(PYTHON_VERSION))
3535

3636
OPENSSL_VERSION_NUMBER=1.0.2
37-
OPENSSL_REVISION=m
37+
OPENSSL_REVISION=n
3838
OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
3939

4040
BZIP2_VERSION=1.0.6
@@ -337,18 +337,17 @@ clean-$1:
337337

338338
dist/Python-$(PYTHON_VER)-$1-support.b$(BUILD_NUMBER).tar.gz: $$(BZIP2_FRAMEWORK-$1) $$(XZ_FRAMEWORK-$1) $$(OPENSSL_FRAMEWORK-$1) $$(PYTHON_FRAMEWORK-$1)
339339
mkdir -p dist
340-
echo "Python version: $(PYTHON_VERSION) " > build/$1/Support/VERSIONS
341-
echo "Build: $(BUILD_NUMBER)" >> build/$1/Support/VERSIONS
342-
echo "---------------------" >> build/$1/Support/VERSIONS
343-
echo "BZip2: $(BZIP2_VERSION)" >> build/$1/Support/VERSIONS
344-
echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/Support/VERSIONS
345-
echo "XZ: $(XZ_VERSION)" >> build/$1/Support/VERSIONS
340+
echo "Python version: $(PYTHON_VERSION) " > build/$1/VERSIONS
341+
echo "Build: $(BUILD_NUMBER)" >> build/$1/VERSIONS
342+
echo "---------------------" >> build/$1/VERSIONS
343+
echo "BZip2: $(BZIP2_VERSION)" >> build/$1/VERSIONS
344+
echo "OpenSSL: $(OPENSSL_VERSION)" >> build/$1/VERSIONS
345+
echo "XZ: $(XZ_VERSION)" >> build/$1/VERSIONS
346346
ifeq ($1,macOS)
347347
cp -r build/$1/Python-$(PYTHON_VERSION)-macosx.x86_64/dist build/$1/python
348-
mv build/$1/Support/VERSIONS build/$1
349348
tar zcvf $$@ -C build/$1 VERSIONS python
350349
else
351-
tar zcvf $$@ -C build/$1 Support
350+
tar zcvf $$@ -C build/$1 VERSIONS Support
352351
endif
353352

354353
# Build OpenSSL

0 commit comments

Comments
 (0)