diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2008-09-07 06:07:29 +0400 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2008-09-07 06:07:29 +0400 |
| commit | 07aed2eee80e122a5dc1c1d5d1d0026f8b1dadee (patch) | |
| tree | 1743f3fbbfe7962e616b7870102937e4a5a480f5 /winsup/mingw | |
| parent | 2c4143f4012c77dcdf722bd87b10397e170ecb0d (diff) | |
2008-09-06 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* Makefile.in: Adjust to new naming standard for MinGW while maintaining old
naming standard for Cygwin.
Diffstat (limited to 'winsup/mingw')
| -rw-r--r-- | winsup/mingw/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/mingw/Makefile.in | 27 |
2 files changed, 28 insertions, 4 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 7d881b59a..48d10cc85 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2008-09-06 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> + + * Makefile.in: Adjust to new naming standard for MinGW while maintaining old + naming standard for Cygwin. + 2008-08-31 Keith Marshall <keithmarshall@users.sourceforge.net> Reimplement getopt.c to add getopt_long_only() function. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index c9ced3cf6..d8ba90603 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -17,7 +17,6 @@ # This makefile requires GNU make. -PACKAGE = mingw-runtime VERSION = @PACKAGE_VERSION@ CYGRELEASE = 1 @@ -31,6 +30,14 @@ target_alias = @target_alias@ with_cross_host = @with_cross_host@ prefix = @prefix@ conf_prefix = @prefix@ +# FIXME: this needs an appropriate AC_SUBST +host_os = mingw32 + +ifneq (,$(findstring cygwin, $(target_alias))) +PACKAGE = mingw-runtime +else +PACKAGE = mingwrt +endif program_transform_name = @program_transform_name@ exec_prefix = @exec_prefix@ @@ -71,7 +78,7 @@ else inst_bindir:=$(bindir) inst_includedir:=$(includedir) inst_libdir:=$(libdir) -inst_docdir:=$(prefix)/doc/mingw-runtime +inst_docdir:=$(prefix)/doc/runtime endif endif @@ -345,12 +352,12 @@ distclean: clean -rm -f Makefile ifdef SNAPDATE - distdir=$(PACKAGE)-$(VERSION)-$(SNAPDATE) + distdir=$(PACKAGE)-$(VERSION)-$(SNAPDATE)-$(host_os) else ifneq (,$(findstring cygwin, $(target_alias))) distdir=$(PACKAGE)-$(VERSION)-$(CYGRELEASE) else - distdir=$(PACKAGE)-$(VERSION) + distdir=$(PACKAGE)-$(VERSION)-$(host_os) endif endif @@ -395,6 +402,7 @@ srcdist: $(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir) +ifneq (,$(findstring cygwin, $(target_alias))) bindist: rm -rf $(distdir) mkdir $(distdir) @@ -403,6 +411,17 @@ bindist: rm -f $(distdir).tar.gz cd $(distdir); \ $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) * +else +bindist: + rm -rf $(distdir) + mkdir $(distdir) + chmod 755 $(distdir) + $(MAKE) install prefix=$(shell pwd)/$(distdir)$(dist_prefix) + rm -f $(distdir).tar.gz + cd $(distdir); \ + $(TAR) $(TARFLAGS)cf ../$(distdir)-dev$(TARFILEEXT) * --exclude=bin; \ + $(TAR) $(TARFLAGS)cf ../$(distdir)-dll$(TARFILEEXT) bin/*.dll +endif snapshot: make dist SNAPDATE=$(shell date '+%Y%m%d') |