diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-22 17:21:01 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-22 17:21:01 +0200 |
| commit | 37496853cd98e546142c1bef8deaecb78e8db8a2 (patch) | |
| tree | 64107e00fa46b4b77fd4e71dbdbbae30079eb430 /config.make.in | |
| parent | 3130514bd99bdc4cf8a51e24be2d8bf6f1e47f62 (diff) | |
Fix DESTDIR support
Adding $(DESTDIR) to paths in config.make.in brings redundant additions
when e.g. datarootdir is "${datadir}". The viable way is to just fix
the installation rules.
* Makeconf (install, install-headers): Prepend $(DESTDIR) to dependencies.
($(DESTDIR)$(installationdir)): New rule.
($(addprefix $(installationdir)/,$(installable))): Prepend $(DESTDIR).
($($(includedir)/$(installhdrsubdir))): Likewise.
($(addprefix $(libdir)/$(libname),_p.a .a _pic.a)): Likewise.
($(libdir)/$(libname).so.$(hurd-version)): Likewise.
($(libdir)/$(libname).so): Likewise.
($(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs))):
Likewise.
($(installationdirlist)): Likewise.
* config.make.in (hurddir, libdir, bindir, sbindir, includedir, libexecdir,
bootdir, infodir, sysconfdir, localstatedir, sharedstatedir, datadir,
datarootdir): Remove $(DESTDIR).
* config/Makefile (install): Prepend $(DESTDIR) to dependencies.
($(sysconfdir)/login): Prepend $(DESTDIR).
($(installed_logins)): Likewise.
($(installed_conf)): Likewise.
* console-client/Makefile (install): Prepend $(DESTDIR) to dependencies.
($(module-dir)): Prepend $(DESTDIR).
($(module-dir)/%): Likewise.
($(XKB_BASE)): Likewise.
($(XKB_BASE)/%): Likewise.
* hurd/Makefile (install-headers, install-msgids): Prepend $(DESTDIR) to
dependencies.
($(includedir)/hurd/%): Prepend $(DESTDIR).
($(datadir)/msgids, $(includedir)/hurd): Prepend $(DESTDIR).
* include/Makefile (install): Prepend $(DESTDIR) to dependencies.
($(includedir)/%): Prepend $(DESTDIR).
* libstore/Makefile (install): Prepend $(DESTDIR) to dependencies.
($(store-types:%=$(libdir)/libstore_%.a): Prepend $(DESTDIR).
* sutils/Makefile (install): Prepend $(DESTDIR) to dependencies.
($(prefix)/dev/MAKEDEV): Prepent $(DESTDIR).
($(prefix)/dev): Likewise.
Diffstat (limited to 'config.make.in')
| -rw-r--r-- | config.make.in | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config.make.in b/config.make.in index cdd812e0..7b62e851 100644 --- a/config.make.in +++ b/config.make.in @@ -20,19 +20,19 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ # Directories where things get installed. -hurddir = $(DESTDIR)${exec_prefix}/hurd -libdir = $(DESTDIR)@libdir@ -bindir = $(DESTDIR)@bindir@ -sbindir = $(DESTDIR)@sbindir@ -includedir = $(DESTDIR)@includedir@ -libexecdir = $(DESTDIR)@libexecdir@ -bootdir = $(DESTDIR)${exec_prefix}/boot -infodir = $(DESTDIR)@infodir@ -sysconfdir = $(DESTDIR)@sysconfdir@ -localstatedir = $(DESTDIR)@localstatedir@ -sharedstatedir = $(DESTDIR)@sharedstatedir@ -datadir = $(DESTDIR)@datadir@ -datarootdir = $(DESTDIR)@datarootdir@ +hurddir = ${exec_prefix}/hurd +libdir = @libdir@ +bindir = @bindir@ +sbindir = @sbindir@ +includedir = @includedir@ +libexecdir = @libexecdir@ +bootdir = ${exec_prefix}/boot +infodir = @infodir@ +sysconfdir = @sysconfdir@ +localstatedir = @localstatedir@ +sharedstatedir = @sharedstatedir@ +datadir = @datadir@ +datarootdir = @datarootdir@ # All of those directories together: installationdirlist = $(hurddir) $(libdir) $(bindir) $(sbindir) \ |