From e1849e2848fa6a35990f9b7759997da81b93dc25 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sun, 5 May 2024 21:49:37 +0100 Subject: [PATCH] build system: Support DESTDIR --- Makefile.in | 8 ++++---- client/Makefile.in | 4 ++-- common.make.in | 2 +- dynamic/Makefile.in | 6 +++--- src/Makefile.in | 6 ++++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index 976a159..7fbac7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,10 +75,10 @@ adnshost.txt: all web-install: adnshost.txt test -e $(WEBDIR) || mkdir $(WEBDIR) - $(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/ - $(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt - $(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt - $(INSTALL_DATA) adnshost.txt $(WEBDIR)/ + $(INSTALL_DATA) $(srcdir)/README.html $(DESTDIR)$(WEBDIR)/ + $(INSTALL_DATA) $(srcdir)/src/adns.h $(DESTDIR)$(WEBDIR)/adns.h.txt + $(INSTALL_DATA) COPYING $(DESTDIR)$(WEBDIR)/COPYING.txt + $(INSTALL_DATA) adnshost.txt $(DESTDIR)$(WEBDIR)/ check: all $(MAKE) -C regress check diff --git a/client/Makefile.in b/client/Makefile.in index 6264482..144eafd 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -58,9 +58,9 @@ ALL_OBJS= $(ADH_OBJS) $(TARG_OBJS) all: $(TARGETS) install: $(TARG_INSTALL) - mkdir -p $(bindir) + $(INSTALL_DIR) $(DESTDIR)$(bindir) set -xe; for f in $(TARG_INSTALL); \ - do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done + do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done uninstall: for f in $(TARGETS); do rm -f $(bindir)/$$f; done diff --git a/common.make.in b/common.make.in index d5188d9..e50eb85 100644 --- a/common.make.in +++ b/common.make.in @@ -71,4 +71,4 @@ endif INSTALL_PROGRAM= $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS) INSTALL_DATA= $(INSTALL) -m 644 - +INSTALL_DIR= $(INSTALL) -d 755 diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in index 0083e1d..52662a7 100644 --- a/dynamic/Makefile.in +++ b/dynamic/Makefile.in @@ -31,9 +31,9 @@ ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS))) install: mkdir -p $(libdir) - $(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE) - ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME) - ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK) + $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE) + ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) + ln -sf $(SHLIBSONAME) $(DESTDIR)$(libdir)/$(SHLIBFORLINK) uninstall: rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME) diff --git a/src/Makefile.in b/src/Makefile.in index a84807e..44ac07b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -32,8 +32,10 @@ DIRCFLAGS= -I. -I$(srcdir) install: mkdir -p $(libdir) $(includedir) set -xe; for f in $(TARGETS); \ - do $(INSTALL_DATA) $$f $(libdir)/$$f; done - $(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h + do $(INSTALL_DIR) $(DESTDIR)$(libdir); \ + $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h uninstall: for f in $(TARGETS); do rm -f $(libdir)/$$f; done -- 2.30.2