From 2b7c35f089b8b05c585ba221a3369a54e6551593 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 26 Mar 1999 21:57:14 +0000 Subject: [PATCH] * automake.in (am_install_var): Removed obsolete comment. * texinfos.am (uninstall-info): Don't print loop but instead print commands. Simplified pre-uninstall loop. * scripts.am (uninstall-@DIR@SCRIPTS): Don't print loop but instead print commands. * progs.am (uninstall-@DIR@PROGRAMS): Don't print loop but instead print commands. * ltlib.am (uninstall-@DIR@LTLIBRARIES): Don't print loop but instead print commands. * lisp.am (install-@DIR@LISP): Strip subdir from file name. (uninstall-@DIR@LISP): Likewise. Also, don't print loop but instead print commands. * libs.am (uninstall-@DIR@LIBRARIES): Don't print loop but instead print commands. * java.am (uninstall-@DIR@JAVA): Don't print loop but instead print commands. * header.am (install-@DIR@HEADERS): Strip subdir from file name. (uninstall-@DIR@HEADERS): Likewise. Also, don't print loop but instead print commands. * data.am (install-@DIR@DATA): Strip subdir from file name. (uninstall-@DIR@DATA): Likewise. Also, don't print loop but instead print commands. --- ChangeLog | 24 +++++++++++++++++ HACKING | 5 ++++ Makefile.in | 66 ++++++++++++++++++++++++---------------------- automake.in | 5 +--- data.am | 22 +++++++++------- header.am | 13 +++++---- java.am | 5 ++-- lib/am/data.am | 22 +++++++++------- lib/am/header.am | 13 +++++---- lib/am/java.am | 5 ++-- lib/am/libs.am | 5 ++-- lib/am/lisp.am | 17 +++++++----- lib/am/ltlib.am | 5 ++-- lib/am/progs.am | 6 +++-- lib/am/scripts.am | 8 +++--- lib/am/texinfos.am | 22 +++++++++------- libs.am | 5 ++-- lisp.am | 17 +++++++----- ltlib.am | 5 ++-- m4/Makefile.in | 21 +++++++-------- progs.am | 6 +++-- scripts.am | 8 +++--- stamp-vti | 2 +- tests/Makefile.in | 2 +- texinfos.am | 22 +++++++++------- version.texi | 2 +- 26 files changed, 197 insertions(+), 136 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f48eb77..ae290622 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ 1999-03-26 Tom Tromey + * automake.in (am_install_var): Removed obsolete comment. + + * texinfos.am (uninstall-info): Don't print loop but instead print + commands. Simplified pre-uninstall loop. + * scripts.am (uninstall-@DIR@SCRIPTS): Don't print loop but + instead print commands. + * progs.am (uninstall-@DIR@PROGRAMS): Don't print loop but instead + print commands. + * ltlib.am (uninstall-@DIR@LTLIBRARIES): Don't print loop but + instead print commands. + * lisp.am (install-@DIR@LISP): Strip subdir from file name. + (uninstall-@DIR@LISP): Likewise. Also, don't print loop but + instead print commands. + * libs.am (uninstall-@DIR@LIBRARIES): Don't print loop but instead + print commands. + * java.am (uninstall-@DIR@JAVA): Don't print loop but instead + print commands. + * header.am (install-@DIR@HEADERS): Strip subdir from file name. + (uninstall-@DIR@HEADERS): Likewise. Also, don't print loop but + instead print commands. + * data.am (install-@DIR@DATA): Strip subdir from file name. + (uninstall-@DIR@DATA): Likewise. Also, don't print loop but + instead print commands. + * automake.in (handle_merge_targets): `install-strip' is a phony target. From Michel de Ruiter. diff --git a/HACKING b/HACKING index 6bde75a3..0ac188dc 100644 --- a/HACKING +++ b/HACKING @@ -45,6 +45,11 @@ * Never use basename or dirname. Instead use sed +* For install and uninstall rules, if a loop is required, it should be + silent. Then the body of the loop itself should print each + "important" comman it runs. The printed commands should be preceded + by a single space. + ================================================================ = Editing automake.in and aclocal.in diff --git a/Makefile.in b/Makefile.in index 0e2a9f27..2cb55ba8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -143,8 +143,10 @@ install-binSCRIPTS: $(bin_SCRIPTS) uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + file="`echo $$p|sed '$(transform)'`"; \ + echo " rm -f $(DESTDIR)$(bindir)/$$file"; \ + rm -f $(DESTDIR)$(bindir)/$$file; \ done $(srcdir)/version.texi: stamp-vti @@ -245,17 +247,19 @@ install-info-am: $(INFO_DEPS) uninstall-info: $(PRE_UNINSTALL) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - ii=yes; \ - else ii=; fi; \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - test -z "$ii" \ - || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ - done + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + done; \ + else :; fi @$(NORMAL_UNINSTALL) - list='$(INFO_DEPS)'; \ + @list='$(INFO_DEPS)'; \ for file in $$list; do \ - (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + (if cd $(DESTDIR)$(infodir); then \ + echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ + rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ + else :; fi); \ done dist-info: $(INFO_DEPS) @@ -292,38 +296,36 @@ install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @list='$(pkgdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ done uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) - list='$(pkgdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ + @list='$(pkgdata_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ + rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ done install-scriptDATA: $(script_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(scriptdir) @list='$(script_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(scriptdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(scriptdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(scriptdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(scriptdir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(scriptdir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(scriptdir)/$$f; \ done uninstall-scriptDATA: @$(NORMAL_UNINSTALL) - list='$(script_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(scriptdir)/$$p; \ + @list='$(script_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(scriptdir)/$$f"; \ + rm -f $(DESTDIR)$(scriptdir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd @@ -563,9 +565,9 @@ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-local installcheck-am \ installcheck install-exec-am install-exec install-data-am install-data \ install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs-am installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +install-strip installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean install-data-hook: diff --git a/automake.in b/automake.in index 8b7252c3..e8fd7e02 100755 --- a/automake.in +++ b/automake.in @@ -6697,10 +6697,7 @@ sub am_install_var # variable of the same name (with "dir" appended) exists. For # instance, if the variable "zardir" is defined, then # "zar_PROGRAMS" becomes valid. This is to provide a little extra - # flexibility in those cases which need it. Perhaps it should be - # disallowed in the Gnits case? The problem is, sometimes it is - # useful to put things in a subdir of eg pkgdatadir, perhaps even - # for Gnitsoids. + # flexibility in those cases which need it. local (%valid) = &am_primary_prefixes ($primary, @prefixes); # If a primary includes a configure substitution, then the EXTRA_ diff --git a/data.am b/data.am index 82883d6e..a27780a5 100644 --- a/data.am +++ b/data.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -21,17 +21,19 @@ install-@DIR@DATA: $(@DIR@_DATA) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ +## If the _DATA variable has an entry like foo/bar, install it as +## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a +## new dir variable for the latter case. + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \ done uninstall-@DIR@DATA: @$(NORMAL_UNINSTALL) - list='$(@DIR@_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ + @list='$(@DIR@_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$f; \ done diff --git a/header.am b/header.am index d0ae6ba6..2dbd931a 100644 --- a/header.am +++ b/header.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -23,12 +23,15 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS) @list='$(@DIR@_HEADERS)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \ done uninstall-@DIR@HEADERS: @$(NORMAL_UNINSTALL) - list='$(@DIR@_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ + @list='$(@DIR@_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$f; \ done diff --git a/java.am b/java.am index b72cdc27..fe2ed004 100644 --- a/java.am +++ b/java.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999 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 @@ -28,6 +28,7 @@ install-@DIR@JAVA: class@DIR@.stamp uninstall-@DIR@JAVA: @$(NORMAL_UNINSTALL) - for p in *.class; do \ + @for p in *.class; do \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/data.am b/lib/am/data.am index 82883d6e..a27780a5 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -21,17 +21,19 @@ install-@DIR@DATA: $(@DIR@_DATA) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ +## If the _DATA variable has an entry like foo/bar, install it as +## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a +## new dir variable for the latter case. + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \ done uninstall-@DIR@DATA: @$(NORMAL_UNINSTALL) - list='$(@DIR@_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ + @list='$(@DIR@_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$f; \ done diff --git a/lib/am/header.am b/lib/am/header.am index d0ae6ba6..2dbd931a 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -23,12 +23,15 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS) @list='$(@DIR@_HEADERS)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \ done uninstall-@DIR@HEADERS: @$(NORMAL_UNINSTALL) - list='$(@DIR@_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ + @list='$(@DIR@_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$f; \ done diff --git a/lib/am/java.am b/lib/am/java.am index b72cdc27..fe2ed004 100644 --- a/lib/am/java.am +++ b/lib/am/java.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999 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 @@ -28,6 +28,7 @@ install-@DIR@JAVA: class@DIR@.stamp uninstall-@DIR@JAVA: @$(NORMAL_UNINSTALL) - for p in *.class; do \ + @for p in *.class; do \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/libs.am b/lib/am/libs.am index 324df391..2e28e326 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -42,6 +42,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) uninstall-@DIR@LIBRARIES: @$(NORMAL_UNINSTALL) - list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 9dfc5cab..6cb6a0e1 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1996, 1998, 1999 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 @@ -23,17 +23,20 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) @list='$(@DIR@_LISP)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ - $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c; \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c"; \ + $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c; \ else : ; fi; \ done uninstall-@DIR@LISP: @$(NORMAL_UNINSTALL) - list='$(@DIR@_LISP)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p $(DESTDIR)$(@DIR@dir)/$${p}c; \ + @list='$(@DIR@_LISP)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c"; \ + rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c; \ done diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index 50200fe3..52fff899 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 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 @@ -33,6 +33,7 @@ install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) uninstall-@DIR@LTLIBRARIES: @$(NORMAL_UNINSTALL) - list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ + @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ + echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \ @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lib/am/progs.am b/lib/am/progs.am index 5179331f..b573b206 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -32,6 +32,8 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) uninstall-@DIR@PROGRAMS: @$(NORMAL_UNINSTALL) - list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \ + @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ + file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$file; \ done diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 420abb4b..a0f5c378 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -32,8 +32,10 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) uninstall-@DIR@SCRIPTS: @$(NORMAL_UNINSTALL) - list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ + file="`echo $$p|sed '$(transform)'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$file; \ done ## Uncomment line in handle_scripts when this is uncommented. diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 7430efb2..117da12b 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994-98, 1999 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 @@ -177,17 +177,19 @@ uninstall-info: ## Run two loops here so that we can handle PRE_UNINSTALL and ## NORMAL_UNINSTALL correctly. @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - ii=yes; \ - else ii=; fi; \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - test -z "$ii" \ - || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ - done + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + done; \ + else :; fi @$(NORMAL_UNINSTALL) - list='$(INFO_DEPS)'; \ + @list='$(INFO_DEPS)'; \ for file in $$list; do \ - (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + (if cd $(DESTDIR)$(infodir); then \ + echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ + rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ + else :; fi); \ done dist-info: $(INFO_DEPS) diff --git a/libs.am b/libs.am index 324df391..2e28e326 100644 --- a/libs.am +++ b/libs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -42,6 +42,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) uninstall-@DIR@LIBRARIES: @$(NORMAL_UNINSTALL) - list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/lisp.am b/lisp.am index 9dfc5cab..6cb6a0e1 100644 --- a/lisp.am +++ b/lisp.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1996, 1998, 1999 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 @@ -23,17 +23,20 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) @list='$(@DIR@_LISP)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ - $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c; \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c"; \ + $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c; \ else : ; fi; \ done uninstall-@DIR@LISP: @$(NORMAL_UNINSTALL) - list='$(@DIR@_LISP)'; for p in $$list; do \ - rm -f $(@DIR@dir)/$$p $(DESTDIR)$(@DIR@dir)/$${p}c; \ + @list='$(@DIR@_LISP)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c"; \ + rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c; \ done diff --git a/ltlib.am b/ltlib.am index 50200fe3..52fff899 100644 --- a/ltlib.am +++ b/ltlib.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 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 @@ -33,6 +33,7 @@ install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) uninstall-@DIR@LTLIBRARIES: @$(NORMAL_UNINSTALL) - list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ + @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \ + echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \ @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \ done diff --git a/m4/Makefile.in b/m4/Makefile.in index a6c2a11f..95cb5d70 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -96,19 +96,18 @@ install-m4dataDATA: $(m4data_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(m4datadir) @list='$(m4data_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \ - fi; fi; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \ done uninstall-m4dataDATA: @$(NORMAL_UNINSTALL) - list='$(m4data_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(m4datadir)/$$p; \ + @list='$(m4data_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ + rm -f $(DESTDIR)$(m4datadir)/$$f; \ done tags: TAGS TAGS: @@ -191,8 +190,8 @@ maintainer-clean: maintainer-clean-am .PHONY: uninstall-m4dataDATA install-m4dataDATA tags distdir info-am \ info dvi-am dvi check check-am installcheck-am installcheck \ install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ +install uninstall-am uninstall all-redirect all-am all install-strip \ +installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/progs.am b/progs.am index 5179331f..b573b206 100644 --- a/progs.am +++ b/progs.am @@ -32,6 +32,8 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) uninstall-@DIR@PROGRAMS: @$(NORMAL_UNINSTALL) - list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \ + @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ + file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$file; \ done diff --git a/scripts.am b/scripts.am index 420abb4b..a0f5c378 100644 --- a/scripts.am +++ b/scripts.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1998, 1999 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 @@ -32,8 +32,10 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) uninstall-@DIR@SCRIPTS: @$(NORMAL_UNINSTALL) - list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ + @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \ + file="`echo $$p|sed '$(transform)'`"; \ + echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \ + rm -f $(DESTDIR)$(@DIR@dir)/$$file; \ done ## Uncomment line in handle_scripts when this is uncommented. diff --git a/stamp-vti b/stamp-vti index 1623932f..609b3035 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 22 March 1999 +@set UPDATED 25 March 1999 @set EDITION 1.4a @set VERSION 1.4a diff --git a/tests/Makefile.in b/tests/Makefile.in index 02f02928..d3c1a3b8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -193,7 +193,7 @@ maintainer-clean: maintainer-clean-am .PHONY: tags distdir check-TESTS info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ +all-redirect all-am all install-strip installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean diff --git a/texinfos.am b/texinfos.am index 7430efb2..117da12b 100644 --- a/texinfos.am +++ b/texinfos.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +## Copyright (C) 1994-98, 1999 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 @@ -177,17 +177,19 @@ uninstall-info: ## Run two loops here so that we can handle PRE_UNINSTALL and ## NORMAL_UNINSTALL correctly. @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - ii=yes; \ - else ii=; fi; \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - test -z "$ii" \ - || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ - done + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + done; \ + else :; fi @$(NORMAL_UNINSTALL) - list='$(INFO_DEPS)'; \ + @list='$(INFO_DEPS)'; \ for file in $$list; do \ - (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + (if cd $(DESTDIR)$(infodir); then \ + echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ + rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ + else :; fi); \ done dist-info: $(INFO_DEPS) diff --git a/version.texi b/version.texi index 1623932f..609b3035 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 22 March 1999 +@set UPDATED 25 March 1999 @set EDITION 1.4a @set VERSION 1.4a -- 2.43.5