diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/makefile/nmake.in | 8 | ||||
| -rw-r--r-- | src/build-data/makefile/unix.in | 12 | ||||
| -rw-r--r-- | src/build-data/makefile/unix_shr.in | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index df4669dd4..b730beab1 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -21,11 +21,11 @@ VERSION = $(MAJOR).$(MINOR).$(PATCH) ################################################## # Installation Settings # ################################################## -INSTALLROOT = @{var:prefix} +DESTDIR = @{var:prefix} -LIBDIR = $(INSTALLROOT)\@{var:libdir} -HEADERDIR = $(INSTALLROOT)\@{var:includedir}\botan -DOCDIR = $(INSTALLROOT)\@{var:docdir}\Botan-$(VERSION) +LIBDIR = $(DESTDIR)\@{var:libdir} +HEADERDIR = $(DESTDIR)\@{var:includedir}\botan +DOCDIR = $(DESTDIR)\@{var:docdir}\Botan-$(VERSION) ################################################## # Aliases for Common Programs # diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index 3422f50cf..cd4e2c46a 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -21,12 +21,12 @@ VERSION = $(MAJOR).$(MINOR).$(PATCH) ################################################## # Installation Settings # ################################################## -INSTALLROOT = @{var:prefix} +DESTDIR = @{var:prefix} -BINDIR = $(INSTALLROOT)/bin -LIBDIR = $(INSTALLROOT)/@{var:libdir} -HEADERDIR = $(INSTALLROOT)/@{var:includedir}/botan -DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) +BINDIR = $(DESTDIR)/bin +LIBDIR = $(DESTDIR)/@{var:libdir} +HEADERDIR = $(DESTDIR)/@{var:includedir}/botan +DOCDIR = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION) CONFIG_SCRIPT = @{var:botan-config} @@ -102,7 +102,7 @@ distclean: clean $(RM) Makefile $(CONFIG_SCRIPT) install: $(LIBRARIES) - $(ECHO) "Installing Botan into $(INSTALLROOT)... " + $(ECHO) "Installing Botan into $(DESTDIR)... " $(MKDIR_INSTALL) $(DOCDIR) $(MKDIR_INSTALL) $(HEADERDIR) $(MKDIR_INSTALL) $(LIBDIR) diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in index a3be7d3af..d8d6fa63d 100644 --- a/src/build-data/makefile/unix_shr.in +++ b/src/build-data/makefile/unix_shr.in @@ -23,12 +23,12 @@ VERSION = $(MAJOR).$(MINOR).$(PATCH) ################################################## # Installation Settings # ################################################## -INSTALLROOT = @{var:prefix} +DESTDIR = @{var:prefix} -BINDIR = $(INSTALLROOT)/bin -LIBDIR = $(INSTALLROOT)/@{var:libdir} -HEADERDIR = $(INSTALLROOT)/@{var:includedir}/botan -DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) +BINDIR = $(DESTDIR)/bin +LIBDIR = $(DESTDIR)/@{var:libdir} +HEADERDIR = $(DESTDIR)/@{var:includedir}/botan +DOCDIR = $(DESTDIR)/@{var:docdir}/Botan-$(VERSION) CONFIG_SCRIPT = @{var:botan-config} @@ -115,7 +115,7 @@ distclean: clean $(RM) Makefile $(CONFIG_SCRIPT) install: $(LIBRARIES) - $(ECHO) "Installing Botan into $(INSTALLROOT)... " + $(ECHO) "Installing Botan into $(DESTDIR)... " $(MKDIR_INSTALL) $(DOCDIR) $(MKDIR_INSTALL) $(HEADERDIR) $(MKDIR_INSTALL) $(LIBDIR) |