summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-03-01 10:35:59 +0000
committerRoland McGrath <roland@gnu.org>2006-03-01 10:35:59 +0000
commit04dca8d316213b951249e3481ed8d9408495421d (patch)
treedfdfcdf5a03e988f0bc3d772e5ea2d43a65f3a5b /Makefile
parentc9dc3f62698e9b456869ba8c1f0fd8f3c672ebf2 (diff)
downloadglibc-04dca8d316213b951249e3481ed8d9408495421d.tar.gz
* 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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
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