diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-12 21:14:03 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-12 21:54:07 +0100 |
| commit | 3c65577f1af1109beb8de06420efa09188981628 (patch) | |
| tree | a4462f7bef60133b8e4654c3e0d038d077775108 /tools | |
| parent | c619e81011209ec7c52763a07479081fc15076f1 (diff) | |
| download | openssl-new-3c65577f1af1109beb8de06420efa09188981628.tar.gz | |
Rename INSTALL_PREFIX to DESTDIR, remove option --install_prefix
INSTALL_PREFIX is a confusing name, as there's also --prefix.
Instead, tag along with the rest of the open source world and adopt
the Makefile variable DESTDIR to designate the desired staging
directory.
The Configure option --install_prefix is removed, the only way to
designate a staging directory is with the Makefile variable (this is
also implemented for VMS' descrip.mms et al).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index d0c5ca2662..7b4f14e7e6 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -23,27 +23,27 @@ install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @for i in $(APPS) ; \ do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ + (cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \ + chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i ); \ done; @for i in $(MISC_APPS) ; \ do \ - (cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ - chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \ + (cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \ + chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \ + mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i ); \ done; uninstall: @for i in $(APPS) ; \ do \ - echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \ done; @for i in $(MISC_APPS) ; \ do \ - echo $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ - $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ + echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \ + $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \ done; files: |