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/w32api | |
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/w32api')
-rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/w32api/Makefile.in | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 0acae66ba..775e86ccd 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/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-30 Bo Yang <techrazy@users.sourceforge.net> * include/sspi.h: Fix PSecurityFunctionTableW structure. diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in index aec693c47..148dcc339 100644 --- a/winsup/w32api/Makefile.in +++ b/winsup/w32api/Makefile.in @@ -19,6 +19,8 @@ host_alias = @host@ target_alias = @target@ prefix = @prefix@ conf_prefix = @prefix@ +# FIXME: this needs an appropriate AC_SUBST +host_os = mingw32 program_transform_name = @program_transform_name@ exec_prefix = @exec_prefix@ @@ -91,12 +93,12 @@ install uninstall: done 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 @@ -126,6 +128,7 @@ srcdist: rm -f $(distdir)-src$(TARFILEEXT) $(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir) +ifneq (,$(findstring cygwin, $(target_alias))) bindist: rm -rf $(distdir) mkdir $(distdir) @@ -133,6 +136,15 @@ bindist: $(MAKE) install prefix=`pwd`/$(distdir)$(dist_prefix) exec_prefix=`pwd`/$(distdir)$(dist_prefix) rm -f $(distdir)$(TARFILEEXT) cd $(distdir); $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) * +else +bindist: + rm -rf $(distdir) + mkdir $(distdir) + chmod 755 $(distdir) + $(MAKE) install prefix=`pwd`/$(distdir)$(dist_prefix) exec_prefix=`pwd`/$(distdir)$(dist_prefix) + rm -f $(distdir)$(TARFILEEXT) + cd $(distdir); $(TAR) $(TARFLAGS)cf ../$(distdir)-dev$(TARFILEEXT) * +endif snapshot: make dist SNAPDATE=$(shell date '+%Y%m%d') |