From c7b17270e5d252d995bc54b9ec6e46b027f333e8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Mar 1997 00:30:30 +0000 Subject: [PATCH] another _INSTALL var fix --- ChangeLog | 5 +++++ automake.in | 4 ++-- data.am | 2 +- header-vars.am | 12 ++++++------ header.am | 2 +- lib/am/data.am | 2 +- lib/am/header-vars.am | 12 ++++++------ lib/am/header.am | 2 +- lib/am/libs.am | 4 ++-- lib/am/lisp.am | 2 +- lib/am/ltlib.am | 2 +- lib/am/progs.am | 2 +- lib/am/scripts.am | 2 +- lib/am/texinfos.am | 4 ++-- libs.am | 4 ++-- lisp.am | 2 +- ltlib.am | 2 +- progs.am | 2 +- scripts.am | 2 +- texinfos.am | 4 ++-- 20 files changed, 39 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 159ca7a..0cfafee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 27 17:28:47 1997 Tom Tromey + + * header-vars.am: Change _INSTALL variable definitions to `true'. + Updated all users to put `@' before invocation. + Tue Mar 25 22:09:45 1997 Tom Tromey Update to follow GNU Standards: diff --git a/automake.in b/automake.in index ecfef69..e450f9a 100755 --- a/automake.in +++ b/automake.in @@ -3163,7 +3163,7 @@ sub handle_merge_targets $output_rules .= ("install-exec: " . join (' ', @install_exec) . "\n"); - $output_rules .= "\t\$(NORMAL_INSTALL)\n"; + $output_rules .= "\t\@\$(NORMAL_INSTALL)\n"; if (defined $contents{'install-exec-hook'}) { $output_rules .= "\t" . '$(MAKE) install-exec-hook' . "\n"; @@ -3175,7 +3175,7 @@ sub handle_merge_targets $output_rules .= ("install-data: " . join (' ', @install_data) . "\n"); - $output_rules .= "\t\$(NORMAL_INSTALL)\n"; + $output_rules .= "\t\@\$(NORMAL_INSTALL)\n"; if (defined $contents{'install-data-hook'}) { $output_rules .= "\t" . '$(MAKE) install-data-hook' . "\n"; diff --git a/data.am b/data.am index 6bc1d3e..050937d 100644 --- a/data.am +++ b/data.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@DATA: $(@DIR@_DATA) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/header-vars.am b/header-vars.am index f96643a..5a90739 100644 --- a/header-vars.am +++ b/header-vars.am @@ -57,9 +57,9 @@ transform = @program_transform_name@ ## These are defined because otherwise make on NetBSD V1.1 will print ## (eg): $(NORMAL_INSTALL) expands to empty string. -NORMAL_INSTALL = @: -PRE_INSTALL = @: -POST_INSTALL = @: -NORMAL_UNINSTALL = @: -PRE_UNINSTALL = @: -POST_UNINSTALL = @: +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true diff --git a/header.am b/header.am index eacad56..ae54110 100644 --- a/header.am +++ b/header.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@HEADERS: $(@DIR@_HEADERS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/data.am b/lib/am/data.am index 6bc1d3e..050937d 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@DATA: $(@DIR@_DATA) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index f96643a..5a90739 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -57,9 +57,9 @@ transform = @program_transform_name@ ## These are defined because otherwise make on NetBSD V1.1 will print ## (eg): $(NORMAL_INSTALL) expands to empty string. -NORMAL_INSTALL = @: -PRE_INSTALL = @: -POST_INSTALL = @: -NORMAL_UNINSTALL = @: -PRE_UNINSTALL = @: -POST_UNINSTALL = @: +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true diff --git a/lib/am/header.am b/lib/am/header.am index eacad56..ae54110 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@HEADERS: $(@DIR@_HEADERS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/libs.am b/lib/am/libs.am index 6fbc557..a70fe42 100644 --- a/lib/am/libs.am +++ b/lib/am/libs.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @@ -31,7 +31,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## $(POST_INSTALL) in the middle of the loop essentially renders it ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. - $(POST_INSTALL) + @$(POST_INSTALL) @list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 58e9c49..df28caa 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am index 3530a7f..5ff5e7e 100644 --- a/lib/am/ltlib.am +++ b/lib/am/ltlib.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/progs.am b/lib/am/progs.am index 0e590f2..604cfd7 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 5328c1a..d165897 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 85bdba8..61306c6 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -74,7 +74,7 @@ DVIPS = dvips ## Funny name due to --cygnus influence; we want to reserve ## `install-info' for the user. install-info-am: $(INFO_DEPS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(infodir) @for file in $(INFO_DEPS); do \ ## We use these strange circumlocutions because we want the "ifile" to @@ -86,7 +86,7 @@ install-info-am: $(INFO_DEPS) else : ; fi; \ done; \ done - $(POST_INSTALL) + @$(POST_INSTALL) ## Only run this code if install-info actually exists. @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ diff --git a/libs.am b/libs.am index 6fbc557..a70fe42 100644 --- a/libs.am +++ b/libs.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @@ -31,7 +31,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES) ## $(POST_INSTALL) in the middle of the loop essentially renders it ## useless; sh never actually executes this command. Read the GNU ## Standards for a little enlightenment on this. - $(POST_INSTALL) + @$(POST_INSTALL) @list="$(@DIR@_LIBRARIES)"; for p in $$list; do \ if test -f $$p; then \ ## Must ranlib after installing because mod time changes. diff --git a/lisp.am b/lisp.am index 58e9c49..df28caa 100644 --- a/lisp.am +++ b/lisp.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/ltlib.am b/ltlib.am index 3530a7f..5ff5e7e 100644 --- a/ltlib.am +++ b/ltlib.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/progs.am b/progs.am index 0e590f2..604cfd7 100644 --- a/progs.am +++ b/progs.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/scripts.am b/scripts.am index 5328c1a..d165897 100644 --- a/scripts.am +++ b/scripts.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. diff --git a/texinfos.am b/texinfos.am index 85bdba8..61306c6 100644 --- a/texinfos.am +++ b/texinfos.am @@ -74,7 +74,7 @@ DVIPS = dvips ## Funny name due to --cygnus influence; we want to reserve ## `install-info' for the user. install-info-am: $(INFO_DEPS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(infodir) @for file in $(INFO_DEPS); do \ ## We use these strange circumlocutions because we want the "ifile" to @@ -86,7 +86,7 @@ install-info-am: $(INFO_DEPS) else : ; fi; \ done; \ done - $(POST_INSTALL) + @$(POST_INSTALL) ## Only run this code if install-info actually exists. @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ -- 2.7.4