diff options
| -rw-r--r-- | winsup/mingw/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/mingw/Makefile.in | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index f85feb074..ac7cffc3b 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,9 @@ +2002-06-15 Earnie Boyd <earnie@users.sf.net> + + * Makefile.in (conf_prefix): New variable. + (dist_prefix): Ditto. Conditionally set to $(conf_prefix). + (bindist): Use dist_prefix. + 2002-06-13 Danny Smith <dannysmith@users.sourceforge.net> * include/_mingw.h: Increment version to 2.0. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 5f7c3e455..f827d2727 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -29,6 +29,7 @@ host_alias = @host_alias@ build_alias = @build_alias@ target_alias = @target_alias@ prefix = @prefix@ +conf_prefix = @prefix@ program_transform_name = @program_transform_name@ exec_prefix = @exec_prefix@ @@ -286,6 +287,12 @@ ifneq (,$(findstring cygwin, $(target_alias))) TARFILEEXT = .tar.bz2 endif +ifneq (,$(findstring mingw, $(target_alias))) + dist_prefix = +else + dist_prefix = $(conf_prefix) +endif + dist: srcdist bindist srcdist: @@ -312,7 +319,7 @@ bindist: rm -rf $(distdir) mkdir $(distdir) chmod 755 $(distdir) - $(MAKE) install prefix=$(shell pwd)/$(distdir) + $(MAKE) install prefix=$(shell pwd)/$(distdir)$(dist_prefix) rm -f $(distdir).tar.gz cd $(distdir); \ $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) * |