From 8106ab485a9ffbd5804639270e5bc7ea1aeb9a1a Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 7 Nov 2012 09:28:16 -0800 Subject: [PATCH] adns-1.4-destdir --- client/Makefile.in | 4 ++-- dynamic/Makefile.in | 8 ++++---- src/Makefile.in | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/client/Makefile.in b/client/Makefile.in index da0cdf1..92743c8 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -58,9 +58,9 @@ ADNSDIR= $(srcdir)/../src/ all: $(TARGETS) install: $(TARG_INSTALL) - mkdir -p $(bindir) + $(INSTALL_PROGRAM) -d $(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/dynamic/Makefile.in b/dynamic/Makefile.in index f26fe7d..f261cd0 100644 --- a/dynamic/Makefile.in +++ b/dynamic/Makefile.in @@ -30,10 +30,10 @@ include $(srcdir)/../src/adns.make 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) -d $(DESTDIR)/$(libdir) + $(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 7a7d055..ae423d3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -28,10 +28,11 @@ include $(srcdir)/../settings.make include adns.make install: - mkdir -p $(libdir) $(includedir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/$(libdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/$(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_DATA) $$f $(DESTDIR)/$(libdir)/$$f; done + $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)/$(includedir)/adns.h uninstall: for f in $(TARGETS); do rm -f $(libdir)/$$f; done -- 2.7.4