+1998-05-08 21:56 Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+ * autolock.sh: Removed.
+ * manual/move-if-change: Removed.
+
+ * scripts: new directory.
+ * =__ify: moved to scripts.
+ * config.guess: Likewise.
+ * config.sub: Likewise.
+ * gen-FAQ.pl: Likewise.
+ * install-sh: Likewise.
+ * mkinstalldirs: Likewise.
+ * move-if-change: Likewise.
+ * printsources: Likewise.
+ * rellns.sh: Likewise.
+ * test-installation.pl: Likewise.
+
+ * configure.in: Look in scripts for config.guess, config.sub,
+ install-sh.
+ * Makefile: Distribute all above files in their
+ new home. Find gen-FAQ.pl and test-installation.pl in scripts.
+ * manual/Makefile: Find mkinstalldirs and move-if-change in
+ $(..)scripts. Drop them from distribute. Minor cleanups.
+ * Makerules: Find mkinstalldirs and rellns-sh in scripts.
+ * sysdeps/mach/hurd/Makefile: Find move-if-change in scripts.
+ * timezone/Makefile: Find rellns-sh in scripts.
+
1998-05-08 Ulrich Drepper <drepper@cygnus.com>
* intl/locale.alias: Change italian to it_IT.ISO-8859-1.
ifneq (no,$(PERL))
ifeq (/usr,$(prefix))
ifeq (,$(install_root))
- CC="$(CC)" $(PERL) test-installation.pl $(common-objpfx)
+ CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
endif
endif
endif
\f
# Make the distribution tarfile.
-distribute := README README.libm INSTALL FAQ NOTES NEWS PROJECTS BUGS \
- COPYING.LIB COPYING ChangeLog ChangeLog.[0-9] \
- Makefile Makeconfig Makerules Rules Make-dist MakeTAGS \
- extra-lib.mk o-iterator.mk autolock.sh rellns-sh \
- libc.map mkinstalldirs move-if-change install-sh \
- configure configure.in aclocal.m4 config.sub config.guess\
- config.h.in config.make.in config-name.in Makefile.in \
- sysdep.h set-hooks.h libc-symbols.h version.h shlib-versions \
- rpm/Makefile rpm/template rpm/rpmrc glibcbug.in abi-tags \
- stub-tag.h test-installation.pl test-skeleton.c \
- include/des.h
+distribute := README README.libm INSTALL FAQ NOTES NEWS PROJECTS \
+ BUGS COPYING.LIB COPYING ChangeLog ChangeLog.[0-9] \
+ Makefile Makeconfig Makerules Rules Make-dist MakeTAGS \
+ extra-lib.mk o-iterator.mk libc.map configure \
+ configure.in aclocal.m4 config.h.in config.make.in \
+ config-name.in Makefile.in sysdep.h set-hooks.h \
+ libc-symbols.h version.h shlib-versions rpm/Makefile \
+ rpm/template rpm/rpmrc glibcbug.in abi-tags stub-tag.h \
+ test-skeleton.c include/des.h \
+ $(addprefix scripts/, \
+ rellns-sh config.sub config.guess printsources \
+ mkinstalldirs move-if-change install-sh =__ify \
+ test-installation.pl gen-FAQ.pl)
distribute := $(strip $(distribute))
generated := $(generated) stubs.h
NOTES: manual/creature.texi; $(format-me)
manual/dir-add.texi manual/dir-add.info: FORCE
$(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
-FAQ: gen-FAQ.pl FAQ.in
+FAQ: scripts/gen-FAQ.pl FAQ.in
$(PERL) $^ > $@.new && rm -f $@ && mv $@.new $@ && chmod a-w $@
ifeq ($(with-cvs),yes)
test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: $(PERL) $^' $@
# Make the target directory if it doesn't exist, using the `mkinstalldirs'
# script that does `mkdir -p' even if `mkdir' doesn't support that flag.
define make-target-directory
-$(addprefix $(..)./mkinstalldirs ,\
+$(addprefix $(..)./scripts/mkinstalldirs ,\
$(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))
endef
ifneq ($(findstring -s,$(LN_S)),)
define make-link
rm -f $@.new
-$(SHELL) $(..)rellns-sh $< $@.new
+$(SHELL) $(..)scripts/rellns-sh $< $@.new
mv -f $@.new $@
endef
else
+++ /dev/null
-#! /bin/sh
-# interlock - wrap program invocation in lock to allow
-# parallel builds to work.
-# Written by Tom Tromey <tromey@cygnus.com>, Aug 10 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Usage:
-# interlock lock-dir-name program args-to-program...
-
-dirname="$1"
-program="$2"
-
-shift
-shift
-
-while (mkdir $dirname > /dev/null 2>&1 && exit 1 || exit 0); do
- # Wait a bit.
- sleep 1
-done
-
-# Race condition here: if interrupted after the loop but before this
-# trap, the lock can be left around.
-trap "rmdir $dirname > /dev/null 2>&1" 1 2 3 15
-
-# We have the lock, so run the program.
-$program ${1+"$@"}
-ret=$?
-
-# Release the lock.
-rmdir $dirname > /dev/null 2>&1
-
-exit $ret
AC_PREREQ(2.11)dnl dnl Minimum Autoconf version required.
AC_INIT(include/features.h)
AC_CONFIG_HEADER(config.h)
+AC_CONFIG_AUX_DIR(scripts)
# This will get text that should go into config.make.
config_vars=
mv -f $@.new $@
endef
+# scripts we use
+move-if-change = $(..)scripts/move-if-change
+mkinstalldirs = $(..)scripts/mkinstalldirs
+
libc.dvi libc.info: $(chapters) summary.texi $(chapters-incl)
libc.dvi: texinfo.tex
stamp-summary: summary.awk $(chapters) $(chapters-incl)
$(AWK) -f $^ \
| sort -df +1 -2 | tr '\014' '\012' > summary-tmp
- ./move-if-change summary-tmp summary.texi
-# touch is broken on our machines. Sigh.
- date > $@
+ $(move-if-change) summary-tmp summary.texi
+ touch $@
# Generate a file which can be added to the `dir' content to provide direct
# access to the documentation of the function, variables, and other
mv -f $@.new $@
-minimal-dist = summary.awk move-if-change libc.texinfo $(chapters) \
+minimal-dist = summary.awk libc.texinfo $(chapters) \
$(patsubst %.c.texi,examples/%.c, \
$(filter-out summary.texi,$(chapters-incl)))
-doc-only-dist = Makefile COPYING.LIB mkinstalldirs
+doc-only-dist = Makefile COPYING.LIB
distribute = $(minimal-dist) \
$(patsubst examples/%.c,%.c.texi,$(filter examples/%.c, \
$(minimal-dist))) \
`echo $@ | sed "s,$<\$$,$$name,"`; \
done
-installdirs: $(firstword $(wildcard mkinstalldirs ../mkinstalldirs))
- $(dir $<)$(notdir $<) $(inst_infodir)
+installdirs:
+ $(mkinstalldirs) $(inst_infodir)
.PHONY: dist
dist: # glibc-doc-$(edition).tar.gz
endif
$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
$(make-target-directory)
- cp /dev/null $@
-
+ touch $@
# Make the target directory if it doesn't exist, using the `mkinstalldirs'
# script that does `mkdir -p' even if `mkdir' doesn't support that flag.
define make-target-directory
-$(addprefix $(..)./mkinstalldirs ,\
+$(addprefix $(mkinstalldirs) ,\
$(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))
endef
$(AWK) -f $^ > $(hurd)/errnos.h-tmp
# Make it unwritable so noone will edit it by mistake.
-chmod a-w $(hurd)/errnos.h-tmp
- ./$(..)move-if-change $(hurd)/errnos.h-tmp $(hurd)/errnos.h
+ ./$(..)scripts/move-if-change $(hurd)/errnos.h-tmp $(hurd)/errnos.h
ifeq ($(with-cvs),yes)
test ! -d $(hurd)/CVS || \
(cd $(hurd) && cvs commit -m'Regenerated from $^' errnos.h)
echo Site timezone NOT reset to Factory.; \
else \
rm -f $@T; \
- $(SHELL) $(..)/rellns-sh $< $@T; \
+ $(SHELL) $(..)scripts/rellns-sh $< $@T; \
mv -f $@T $@; \
fi
endif
projects / thirdparty / glibc.git / commitdiff
