From 04dca8d316213b951249e3481ed8d9408495421d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 1 Mar 2006 10:35:59 +0000 Subject: * version.h (VERSION): 2.3.91 * Makeconfig (sysdeps-srcdirs): New variable. (sysdeps-add-ons-srcdirs): Use it. * csu/Makefile (all-Banner-files): Use it. * Makefile (dist-selector): New variable. (glibc-%.tar rule): Use it. Make $(dist-separate) tarballs contain one version-named directory. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 25bcca0135..43c4f4d4b5 100644 --- a/Makefile +++ b/Makefile @@ -358,20 +358,18 @@ endif files-for-dist := README FAQ INSTALL NOTES configure tag-of-stem = glibc-$(subst .,_,$*) +dist-selector = -r $(tag-of-stem) # Add-ons in the main repository but distributed in their own tar files. dist-separate = libidn -# Directories in each add-on. -dist-separate-libidn = libidn - glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \ $(foreach D,$(dist-separate),\ $D/configure) @rm -fr glibc-$* $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \ -name configure` - cvs $(CVSOPTS) -Q export -d glibc-$* -r $(tag-of-stem) libc + cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) libc # Touch all the configure scripts going into the tarball since cvs export # might have delivered configure.in newer than configure. find glibc-$* -name configure -print | xargs touch @@ -380,8 +378,10 @@ glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \ rm -fr glibc-$* define dist-do-separate-dirs $(foreach dir,$(dist-separate), - tar cf glibc-$(dir)-$*.tar -C glibc-$* $(dist-separate-$(dir)) - rm -rf $(addprefix glibc-$*/,$(dist-separate-$(dir))) + @rm -fr glibc-$(dir)-$* + mv glibc-$*/$(dir) glibc-$(dir)-$* + tar cf glibc-$(dir)-$*.tar glibc-$(dir)-$* + rm -fr glibc-$(dir)-$* ) endef -- cgit v1.2.3