diff options
author | Roland McGrath <mcgrathr@google.com> | 2013-12-10 14:01:01 -0800 |
---|---|---|
committer | Roland McGrath <mcgrathr@google.com> | 2013-12-10 15:19:50 -0800 |
commit | f2c7d7ee5b94a3ff4fe86d47e9a529cc50bfb7c5 (patch) | |
tree | 652be7e7a25cd12e8c71e523b19181f1765d1fec /gas/Makefile.am | |
parent | 3fb00a37d0b285a9aacfbba1895dc653ad73537d (diff) | |
download | gdb-f2c7d7ee5b94a3ff4fe86d47e9a529cc50bfb7c5.zip gdb-f2c7d7ee5b94a3ff4fe86d47e9a529cc50bfb7c5.tar.gz gdb-f2c7d7ee5b94a3ff4fe86d47e9a529cc50bfb7c5.tar.bz2 |
Use $(INSTALL_PROGRAM_ENV) consistently.
binutils/
* Makefile.am (install-exec-local): Prefix libtool invocation with
$(INSTALL_PROGRAM_ENV).
* Makefile.in: Regenerate.
gas/
* Makefile.am (install-exec-bindir): Prefix libtool invocation
with $(INSTALL_PROGRAM_ENV).
(install-exec-tooldir): Likewise.
* Makefile.in: Regenerate.
gold/
* Makefile.am (install-exec-local): Prefix $(INSTALL_PROGRAM) uses
with $(INSTALL_PROGRAM_ENV).
* Makefile.in: Regenerate.
ld/
* Makefile.am (install-exec-local): Prefix libtool invocation with
$(INSTALL_PROGRAM_ENV).
* Makefile.in: Regenerate.
Diffstat (limited to 'gas/Makefile.am')
-rw-r--r-- | gas/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gas/Makefile.am b/gas/Makefile.am index b85755d..40a833c 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -1,17 +1,17 @@ ## Process this file with automake to generate Makefile.in # -# Copyright 2012 Free Software Foundation +# Copyright 2012, 2013 Free Software Foundation # # This file 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 3 of the License, 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; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. @@ -600,8 +600,8 @@ install-exec-bindir: $(noinst_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -611,7 +611,7 @@ install-exec-tooldir: install-exec-bindir $(noinst_PROGRAMS) if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \ rm -f $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \ - || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \ + || $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \ else \ true ; \ fi |