diff options
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | Makefile | 28 | ||||
| -rw-r--r-- | Makerules | 4 | ||||
| -rwxr-xr-x | autolock.sh | 45 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | manual/Makefile | 22 | ||||
| -rwxr-xr-x | scripts/=__ify (renamed from =__ify) | 0 | ||||
| -rwxr-xr-x | scripts/config.guess (renamed from config.guess) | 0 | ||||
| -rwxr-xr-x | scripts/config.sub (renamed from config.sub) | 0 | ||||
| -rwxr-xr-x | scripts/gen-FAQ.pl (renamed from gen-FAQ.pl) | 0 | ||||
| -rwxr-xr-x | scripts/install-sh (renamed from install-sh) | 0 | ||||
| -rwxr-xr-x | scripts/mkinstalldirs (renamed from mkinstalldirs) | 0 | ||||
| -rwxr-xr-x | scripts/move-if-change (renamed from move-if-change) | 0 | ||||
| -rwxr-xr-x | scripts/printsources (renamed from printsources) | 0 | ||||
| -rwxr-xr-x | scripts/rellns-sh (renamed from rellns-sh) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/test-installation.pl (renamed from test-installation.pl) | 0 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 2 | ||||
| -rw-r--r-- | timezone/Makefile | 2 |
18 files changed, 59 insertions, 72 deletions
diff --git a/ChangeLog b/ChangeLog index 489be7598a..e30e66e34a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +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. diff --git a/Makefile b/Makefile index bfbd474a63..dca5009b92 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ install: 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 @@ -234,17 +234,19 @@ parent_echo-distinfo: # 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 @@ -260,7 +262,7 @@ INSTALL: manual/install.texi; $(format-me) 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) $^' $@ diff --git a/Makerules b/Makerules index 8b81a69290..2b6e39537b 100644 --- a/Makerules +++ b/Makerules @@ -588,7 +588,7 @@ endef # 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 @@ -631,7 +631,7 @@ $(addprefix $(inst_slibdir)/, $(filter-out $(versioned),$(install-lib.so))): \ 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 diff --git a/autolock.sh b/autolock.sh deleted file mode 100755 index 88e27332e6..0000000000 --- a/autolock.sh +++ /dev/null @@ -1,45 +0,0 @@ -#! /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 diff --git a/configure.in b/configure.in index 9866d4b8aa..3c711edd80 100644 --- a/configure.in +++ b/configure.in @@ -3,6 +3,7 @@ AC_REVISION([$CVSid$]) 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= diff --git a/manual/Makefile b/manual/Makefile index d00a3cb586..bc36978ebb 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -64,6 +64,10 @@ define find-includes 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 @@ -78,9 +82,8 @@ summary.texi: stamp-summary ; 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 @@ -102,10 +105,10 @@ dir-add.texinfo: xtract-typefun.awk $(chapters) $(chapters-incl) 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))) \ @@ -171,8 +174,8 @@ $(inst_infodir)/libc.info: libc.info installdirs `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 @@ -212,13 +215,12 @@ stubs: $(objpfx)stubs 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 diff --git a/=__ify b/scripts/=__ify index 017d909a1a..017d909a1a 100755 --- a/=__ify +++ b/scripts/=__ify diff --git a/config.guess b/scripts/config.guess index 413ed41c0f..413ed41c0f 100755 --- a/config.guess +++ b/scripts/config.guess diff --git a/config.sub b/scripts/config.sub index 213a6d47d6..213a6d47d6 100755 --- a/config.sub +++ b/scripts/config.sub diff --git a/gen-FAQ.pl b/scripts/gen-FAQ.pl index 9503903f8c..9503903f8c 100755 --- a/gen-FAQ.pl +++ b/scripts/gen-FAQ.pl diff --git a/install-sh b/scripts/install-sh index ebc66913e9..ebc66913e9 100755 --- a/install-sh +++ b/scripts/install-sh diff --git a/mkinstalldirs b/scripts/mkinstalldirs index d0fd194fd6..d0fd194fd6 100755 --- a/mkinstalldirs +++ b/scripts/mkinstalldirs diff --git a/move-if-change b/scripts/move-if-change index 66d8b8adc7..66d8b8adc7 100755 --- a/move-if-change +++ b/scripts/move-if-change diff --git a/printsources b/scripts/printsources index 062b837c5a..062b837c5a 100755 --- a/printsources +++ b/scripts/printsources diff --git a/rellns-sh b/scripts/rellns-sh index 890f4eea3a..890f4eea3a 100755 --- a/rellns-sh +++ b/scripts/rellns-sh diff --git a/test-installation.pl b/scripts/test-installation.pl index 76aa3fbbfc..76aa3fbbfc 100644..100755 --- a/test-installation.pl +++ b/scripts/test-installation.pl diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 948920dfc1..3719d57016 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -90,7 +90,7 @@ $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \ $(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) diff --git a/timezone/Makefile b/timezone/Makefile index 1c28d86d2b..9b436e17ff 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -143,7 +143,7 @@ $(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ 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 |