From 26eae5d11cf6a9db7dd9ea229a5155a3ccdfecf6 Mon Sep 17 00:00:00 2001 From: Marian Marinov Date: Wed, 15 Jun 2016 03:37:34 +0300 Subject: [PATCH 1/2] Makefile.in: Added support for DESTDIR make parameter The DESTDIR is commonly used in many build systems to define a new root for installing the files before creating packages. Signed-off-by: Marian Marinov --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index ebe8c94..5953563 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,9 +21,9 @@ ifeq ($(PC_LIBS),) endif LIBS+=$(PC_LIBS) -BINDIR=${prefix}/bin -MANDIR=${prefix}/share/man -PPPDIR=/etc/ppp/peers +BINDIR=$(DESTDIR)/${prefix}/bin +MANDIR=$(DESTDIR)/${prefix}/share/man +PPPDIR=$(DESTDIR)/etc/ppp/peers include wvrules.mk From 42d084173cc939586c1963b8835cb00ec56b2823 Mon Sep 17 00:00:00 2001 From: Marian Marinov Date: Wed, 15 Jun 2016 03:55:13 +0300 Subject: [PATCH 2/2] Makefile.in: MANDIR did not include the DESTDIR parameter, so I added it forcefuly Signed-off-by: Marian Marinov --- Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5953563..0119472 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,10 +46,10 @@ install-bin: all cp ppp.provider-pipe ${PPPDIR}/wvdial-pipe install-man: - [ -d ${MANDIR}/man1 ] || install -d ${MANDIR}/man1 - [ -d ${MANDIR}/man5 ] || install -d ${MANDIR}/man5 - install -m 0644 wvdial.1 wvdialconf.1 ${MANDIR}/man1 - install -m 0644 wvdial.conf.5 ${MANDIR}/man5 + [ -d $(DESTDIR)/${MANDIR}/man1 ] || install -d $(DESTDIR)/${MANDIR}/man1 + [ -d $(DESTDIR)/${MANDIR}/man5 ] || install -d $(DESTDIR)/${MANDIR}/man5 + install -m 0644 wvdial.1 wvdialconf.1 $(DESTDIR)/${MANDIR}/man1 + install -m 0644 wvdial.conf.5 $(DESTDIR)/${MANDIR}/man5 install: install-bin install-man