From 97255ffff5ab9613cfc2f41a2a8cd63fa30d969e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 23 Feb 1997 07:21:37 +0000 Subject: [PATCH] error if dir has / --- ChangeLog | 2 ++ Makefile.in | 13 ++++++++----- automake.in | 14 +++++++++++--- m4/Makefile.in | 2 ++ tests/Makefile.in | 31 +++++++++++++++++-------------- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05fc88f3..1a378e39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Sun Feb 23 00:10:36 1997 Tom Tromey + * automake.in (handle_subdirs): Error if directory contains "/". + * m4/sanity.m4: Pass -L to ls if possible. Sat Feb 22 15:22:31 1997 Tom Tromey diff --git a/Makefile.in b/Makefile.in index d7d27ffd..3e50d764 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,6 +90,8 @@ stamp-vti texinfo.tex version.texi ylwrap DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) + +GZIP = --best default: all .SUFFIXES: @@ -101,7 +103,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: configure.in +$(srcdir)/aclocal.m4: configure.in cd $(srcdir) && aclocal config.status: configure @@ -234,7 +236,8 @@ dist-info: $(INFO_DEPS) mostlyclean-info: rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \ automake.fns automake.ky automake.log automake.pg \ - automake.toc automake.tp automake.vr automake.op + automake.toc automake.tp automake.tps automake.vr \ + automake.vrs automake.op clean-info: @@ -315,7 +318,7 @@ distdir = $(PACKAGE)-$(VERSION) # tarfile. distcheck: dist rm -rf $(distdir) - $(TAR) zxf $(distdir).tar.gz + GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ @@ -333,11 +336,11 @@ distcheck: dist echo "========================" dist: distdir -chmod -R a+r $(distdir) - $(TAR) chozf $(distdir).tar.gz $(distdir) + GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - $(TAR) chozf $(distdir).tar.gz $(distdir) + GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) rm -rf $(distdir) distdir: $(DISTFILES) @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ diff --git a/automake.in b/automake.in index c9c7b755..79438f51 100755 --- a/automake.in +++ b/automake.in @@ -2308,9 +2308,17 @@ sub handle_subdirs { # Skip directories substituted by configure. next if $dir =~ /^\@.*\@$/; - &am_line_error ('SUBDIRS', - "required directory $am_relative_dir/$dir does not exist") - if ! -d $am_relative_dir . '/' . $dir; + + if (! -d $am_relative_dir . '/' . $dir) + { + &am_line_error ('SUBDIRS', + "required directory $am_relative_dir/$dir does not exist"); + next; + } + + &am_relative_dir ('SUBDIRS', + "directory should not contain \`/'") + if $dir =~ /\//; } local ($xform) = ('s/\@INSTALLINFO\@/' . diff --git a/m4/Makefile.in b/m4/Makefile.in index 416fddc9..01453f3f 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -61,6 +61,8 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) + +GZIP = --best default: all .SUFFIXES: diff --git a/tests/Makefile.in b/tests/Makefile.in index 74d98b1d..616f5662 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1g from Makefile.am +# Makefile.in generated automatically by automake 1.1l from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,8 +37,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ +VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnits @@ -71,20 +74,20 @@ CONFIG_CLEAN_FILES = DIST_COMMON = ChangeLog Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) -default: all +GZIP = --best +default: all -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in - cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) + cd $(top_srcdir) && automake --gnits tests/Makefile -Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + tags: TAGS TAGS: @@ -122,7 +125,8 @@ check-TESTS: $(TESTS) fi info: dvi: -check: all check-TESTS +check: all + $(MAKE) check-TESTS installcheck: install-exec: $(NORMAL_INSTALL) @@ -158,16 +162,16 @@ maintainer-clean-generic: test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic -clean: clean-generic mostlyclean +clean: clean-generic mostlyclean -distclean: distclean-generic clean +distclean: distclean-generic clean distclean-local rm -f config.status -maintainer-clean: maintainer-clean-generic distclean +maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default tags distdir check-TESTS info dvi check installcheck \ +.PHONY: default tags distdir check-TESTS info dvi installcheck \ install-exec install-data install uninstall all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @@ -175,7 +179,6 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean distclean-local: rm -rf testSubdir -.SUFFIXES: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.43.5