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 /hurd | |
| 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 'hurd')
| -rw-r--r-- | hurd/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hurd/Makefile b/hurd/Makefile index 2902d470..5200baef 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -28,13 +28,13 @@ include ../Makeconf all: $(MSGIDS) install: install-msgids install-headers -install-headers: $(includedir)/hurd \ - $(addprefix $(includedir)/hurd/,$(INSTHDRS)) -install-msgids: $(MSGIDS) $(datadir)/msgids; $(INSTALL_DATA) $^ +install-headers: $(DESTDIR)$(includedir)/hurd \ + $(addprefix $(DESTDIR)$(includedir)/hurd/,$(INSTHDRS)) +install-msgids: $(MSGIDS) $(DESTDIR)$(datadir)/msgids; $(INSTALL_DATA) $^ -$(includedir)/hurd/%: $(srcdir)/%; $(INSTALL_DATA) $< $@ +$(DESTDIR)$(includedir)/hurd/%: $(srcdir)/%; $(INSTALL_DATA) $< $@ -$(datadir)/msgids $(includedir)/hurd:;mkdir -p $@ +$(DESTDIR)$(datadir)/msgids $(DESTDIR)$(includedir)/hurd:;mkdir -p $@ %.msgids: $(srcdir)/%.defs if grep -q '^subsystem' $<; \ |