From 605280b1923b3a86bc98e2d2bd59331d2398da3a Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Tue, 9 Apr 2002 22:22:17 +0000
Subject: [PATCH] * Makefile.in: Use bzip2 compression for Cygwin
target.
---
winsup/mingw/ChangeLog | 1 +
winsup/mingw/Makefile.in | 17 ++++++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 5e5626653..4d4e4016a 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -2,6 +2,7 @@
* moldname-crtdll.def: Remove CR from end of line.
* moldname-msvcrt.def: Ditto.
+ * Makefile.in: Use bzip2 compression for Cygwin target.
2002-04-04 Danny Smith <dannysmith@sourceforge.users.net>
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 6cbf0ad54..b5f236b10 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -112,7 +112,10 @@ DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
DLLWRAP = @DLLWRAP@
DLLWRAP_FOR_TARGET = $(DLLWRAP)
DLLWRAP_FLAGS = --dlltool $(DLLTOOL) --as $(AS) --driver-name $(CC)
+
TAR = tar
+TARFLAGS = z
+TARFILEEXT = .tar.gz
SUBDIRS := @SUBDIRS@
@@ -137,7 +140,10 @@ FLAGS_TO_PASS:=\
inst_includedir="$(inst_includedir)" \
inst_libdir="$(inst_libdir)" \
prefix="$(prefix)" \
- target_alias="$(target_alias)"
+ target_alias="$(target_alias)" \
+ TAR="$(TAR)" \
+ TARFLAGS="$(TARFLAGS)" \
+ TARFILEEXT="$(TARFILEEXT)"
CRT0S = crt1.o dllcrt1.o crt2.o dllcrt2.o CRT_noglob.o crtmt.o crtst.o
MINGW_OBJS = CRTglob.o CRTfmode.o CRTinit.o dirent.o dllmain.o gccmain.o \
@@ -272,6 +278,11 @@ else
endif
endif
+ifneq (,$(findstring cygwin, $(target_alias)))
+ TARFLAGS = j
+ TARFILEEXT = .tar.bz2
+endif
+
dist: srcdist bindist
srcdist:
@@ -291,7 +302,7 @@ srcdist:
cp $(srcdir)/include/sys/*.h $(distdir)/include/sys/
#end FIXME
rm -f $(distdir)-src.tar.gz
- $(TAR) czf $(distdir)-src.tar.gz $(distdir)
+ $(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir)
bindist:
@@ -301,7 +312,7 @@ bindist:
$(MAKE) install prefix=$(shell pwd)/$(distdir)
rm -f $(distdir).tar.gz
cd $(distdir); \
- $(TAR) czf ../$(distdir).tar.gz *
+ $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) *
snapshot:
make dist SNAPDATE=$(shell date '+%Y%m%d')