+Sun May 4 15:21:22 1997 Tom Tromey <tromey@cygnus.com>
+
+ * texinfos.am (install-info): Avoid the Debian install-info.
+ (uninstall-info): Likewise.
+
+ * automake.in (handle_single_transform_list): Strip any directory
+ name before processing name.
+
+Thu May 1 19:24:08 1997 Tom Tromey <tromey@cygnus.com>
+
+ * depend2.am (.deps/%.P): Don't put $(srcdir)/ into dependency.
+
Wed Apr 30 19:15:47 1997 Tom Tromey <tromey@cygnus.com>
* automake.in (handle_dist_worker): Change how top_distdir is
* make sure `missing' defines are generated
* if no AM_INIT_AUTOMAKE, then don't handle `missing' stuff.
Yuck!
+* missing should handle install -d and rmdir -p (for uninstall)
* allow 'cygnus' in AUTOMAKE_OPTIONS
$lex_sources{$_} = 1;
}
+ # Strip any directory prefix.
+ $_ = &basename ($_);
+
# Transform source files into .o files. List of C++
# extensions comes from Emacs 19.34 etags.
if (s/\.(c\+\+|cc|cpp|cxx|C)$/$nonansi_obj/)
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-.deps/%.P: $(srcdir)/%@EXT@
+.deps/%.P: %@EXT@
@echo "Computing dependencies for $<..."
- @o='o'; \
-ONLYC test -n "$o" && o='$$o'; \
+ @o='o'; \
+ONLYC test -n "$o" && o='$$o'; \
$(@MKDEP@) $< | sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," > $@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-.deps/%.P: $(srcdir)/%@EXT@
+.deps/%.P: %@EXT@
@echo "Computing dependencies for $<..."
- @o='o'; \
-ONLYC test -n "$o" && o='$$o'; \
+ @o='o'; \
+ONLYC test -n "$o" && o='$$o'; \
$(@MKDEP@) $< | sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," > $@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
## 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
done; \
done
@$(POST_INSTALL)
-## Only run this code if install-info actually exists.
- @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+## Only run this code if install-info actually exists, and it is not
+## the Debian install-info. FIXME: once Debian install-info goes
+## away, we can remove this hack.
+ @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
for file in $(INFO_DEPS); do \
## Run `:' after install-info in case install-info fails. We really
## don't care about failures here, because they can be spurious. For
$(PRE_UNINSTALL)
## Run two loops here so that we can handle PRE_UNINSTALL and
## NORMAL_UNINSTALL correctly.
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+ @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
ii=yes; \
else ii=; fi; \
for file in $(INFO_DEPS); do \
+Sun May 4 15:47:24 1997 Tom Tromey <tromey@cygnus.com>
+
+ * xsource.test: New file.
+
Tue Apr 29 19:08:47 1997 Tom Tromey <tromey@cygnus.com>
* cond.test, cond2.test: New files from Ian Taylor.
remake2.test output3.test output4.test colneq2.test subst.test \
defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \
cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
-ldadd.test version2.test conf2.test cond.test cond2.test
+ldadd.test version2.test conf2.test cond.test cond2.test xsource.test
EXTRA_DIST = defs $(TESTS)
remake2.test output3.test output4.test colneq2.test subst.test \
defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \
cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \
-ldadd.test version2.test conf2.test cond.test cond2.test
+ldadd.test version2.test conf2.test cond.test cond2.test xsource.test
EXTRA_DIST = defs $(TESTS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- /dev/null
+#! /bin/sh
+
+# Test to make sure source in another directory works.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zardoz
+zardoz_SOURCES = z.c x/y.c
+END
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+END
+
+mkdir x
+
+: > z.c
+: > x/y.c
+
+$AUTOMAKE || exit 1
+
+test `fgrep y.c Makefile.in | wc -l` -eq 1
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
## 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
done; \
done
@$(POST_INSTALL)
-## Only run this code if install-info actually exists.
- @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+## Only run this code if install-info actually exists, and it is not
+## the Debian install-info. FIXME: once Debian install-info goes
+## away, we can remove this hack.
+ @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
for file in $(INFO_DEPS); do \
## Run `:' after install-info in case install-info fails. We really
## don't care about failures here, because they can be spurious. For
$(PRE_UNINSTALL)
## Run two loops here so that we can handle PRE_UNINSTALL and
## NORMAL_UNINSTALL correctly.
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+ @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
ii=yes; \
else ii=; fi; \
for file in $(INFO_DEPS); do \