diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in index e7618460e..6598d7473 100644 --- a/appl/ftp/ftp/Makefile.in +++ b/appl/ftp/ftp/Makefile.in @@ -17,6 +17,7 @@ LIBS = @LIBS@ MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -48,7 +49,7 @@ all: $(PROGS) install: all $(MKINSTALLDIRS) $(bindir) for x in $(PROGS); do \ - $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in index 86cfa65d6..064b54690 100644 --- a/appl/ftp/ftpd/Makefile.in +++ b/appl/ftp/ftpd/Makefile.in @@ -20,6 +20,7 @@ LIBS = @LIBS@ MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -54,7 +55,7 @@ all: ftpd install: all $(MKINSTALLDIRS) $(libexecdir) for x in $(PROGS); do \ - $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in index b1c551bfc..053e6105d 100644 --- a/appl/kx/Makefile.in +++ b/appl/kx/Makefile.in @@ -14,6 +14,7 @@ DEFS = @DEFS@ CFLAGS = $(XINCS) @CFLAGS@ LD_FLAGS = @LD_FLAGS@ INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ LIBS = $(XLIBS) @LIBS@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs @@ -52,10 +53,10 @@ Wall: install: all $(MKINSTALLDIRS) $(bindir) for x in $(PROG_BIN); do \ - $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done for x in $(PROG_LIBEXEC); do \ - $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in index d2748a319..dd6e2fdbc 100644 --- a/appl/otp/Makefile.in +++ b/appl/otp/Makefile.in @@ -12,6 +12,7 @@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ LD_FLAGS = @LD_FLAGS@ INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ LIBS = @LIBS@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs @@ -43,10 +44,10 @@ all: $(PROGS) install: all $(MKINSTALLDIRS) $(bindir) for x in $(PROG_BIN); do \ - $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done -for x in $(PROG_SUIDBIN); do \ - $(INSTALL) -o root -m 04555 $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) -o root -m 04555 $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in index e77093aa4..342414db8 100644 --- a/appl/popper/Makefile.in +++ b/appl/popper/Makefile.in @@ -12,6 +12,7 @@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ LD_FLAGS = @LD_FLAGS@ INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ LIBS = @LIBS@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs @@ -53,7 +54,7 @@ Wall: install: all $(MKINSTALLDIRS) $(bindir) for x in $(PROG_LIBEXEC); do \ - $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in index 692000d1c..7cd474724 100644 --- a/appl/telnet/telnet/Makefile.in +++ b/appl/telnet/telnet/Makefile.in @@ -14,6 +14,7 @@ CFLAGS = @CFLAGS@ LD_FLAGS = @LD_FLAGS@ LIBS = @LIBS@ INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs PROGS = telnet @@ -50,7 +51,7 @@ telnet: $(OBJECTS) install: all $(MKINSTALLDIRS) $(bindir) for x in $(PROGS); do \ - $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index 1565a0d4b..414ce6cb5 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/appl/telnet/telnetd/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = @CFLAGS@ LD_FLAGS = @LD_FLAGS@ LIBS = @LIBS@ INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ @@ -52,7 +53,7 @@ telnetd: $(OBJECTS) install: all $(MKINSTALLDIRS) $(libexecdir) for x in $(PROGS); do \ - $(INSTALL) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(libexecdir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in index 91bc0bc78..a25654ed1 100644 --- a/appl/xnlock/Makefile.in +++ b/appl/xnlock/Makefile.in @@ -17,7 +17,8 @@ CFLAGS = $(XINCS) @CFLAGS@ LD_FLAGS = @LD_FLAGS@ LIBS = $(XLIBS) @LIBS@ INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DATA = $(INSTALL) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ @@ -50,7 +51,7 @@ Wall: install: all $(MKINSTALLDIRS) $(bindir) for x in $(PROG_BIN); do \ - $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done $(MKINSTALLDIRS) $(mandir)/man1 (cd $(srcdir); \ diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in index e7625ad1f..2b435b67d 100644 --- a/lib/auth/afskauthlib/Makefile.in +++ b/lib/auth/afskauthlib/Makefile.in @@ -44,7 +44,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) -if test "$(LIB)" != ""; then \ - $(INSTALL) -m 0555 $(LIB) $(libdir) ; \ + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) ; \ fi uninstall: diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in index 62228010d..539499685 100644 --- a/lib/auth/pam/Makefile.in +++ b/lib/auth/pam/Makefile.in @@ -43,7 +43,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) -if test "$(LIB)" != ""; then \ - $(INSTALL) -m 0555 $(LIB) $(libdir) ; \ + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) ; \ fi uninstall: diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in index 1c9b2194f..fbabfa96e 100644 --- a/lib/auth/sia/Makefile.in +++ b/lib/auth/sia/Makefile.in @@ -43,7 +43,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) -if test "$(LIB)" != ""; then \ - $(INSTALL) -m 0555 $(LIB) $(libdir) ; \ + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) ; \ fi uninstall: diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index 9f9332cff..3faafd4c7 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -16,6 +16,7 @@ LD_FLAGS = @LD_FLAGS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ @@ -66,10 +67,10 @@ mdtest.o: mdtest.c install: all $(MKINSTALLDIRS) $(libdir) - $(INSTALL) -m 0555 $(LIB) $(libdir) + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) $(MKINSTALLDIRS) $(bindir) for x in $(PROGS2INSTALL); do \ - $(INSTALL) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) $$x $(bindir)/`echo $$x | sed '$(transform)'`; \ done uninstall: diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in index 572c550ea..f14425cfb 100644 --- a/lib/editline/Makefile.in +++ b/lib/editline/Makefile.in @@ -44,7 +44,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) - $(INSTALL) -m 0555 $(LIB) $(libdir) + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) uninstall: diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index 6c201892d..3be484677 100644 --- a/lib/kafs/Makefile.in +++ b/lib/kafs/Makefile.in @@ -45,7 +45,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) - $(INSTALL) -m 0555 $(LIB) $(libdir) + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) uninstall: rm -f $(libdir)/$(LIB) diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index 79ed70dda..8cbbc280b 100644 --- a/lib/otp/Makefile.in +++ b/lib/otp/Makefile.in @@ -57,7 +57,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) - $(INSTALL) -m 0555 $(LIB) $(libdir) + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) uninstall: rm -f $(libdir)/$(LIB) diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in index 278cbbcbd..bf022f785 100644 --- a/lib/sl/Makefile.in +++ b/lib/sl/Makefile.in @@ -49,7 +49,7 @@ Wall: install: all $(MKINSTALLDIRS) $(libdir) - $(INSTALL) -m 0555 $(LIB) $(libdir) + $(INSTALL_DATA) -m 0555 $(LIB) $(libdir) uninstall: rm -f $(libdir)/$(LIB)