From f61956c1698560be5c492a4e5920b312e300d25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salvador=20Fandi=C3=B1o?= <sfandino@yahoo.com>
Date: Wed, 31 May 2017 14:30:32 +0200
Subject: Propagate DESTDIR and PREFIX from Makefile

When descending subdirectories and calling configure pass
`--prefix=${DESTDIR}${PREFIX}`, so that installing in a
custom directory works.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dedbe21d8..7103efb34 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ SHLIBDIR        ?= $(LIBDIR)
 NXLIBDIR        ?= $(SHLIBDIR)/nx
 USRLIBDIR       ?= $(NXLIBDIR)/X11
 INCLUDEDIR      ?= $(PREFIX)/include
-CONFIGURE       ?= ./configure
+CONFIGURE       ?= ./configure --prefix=$(DESTDIR)$(PREFIX)
 
 # use Xfont2 if available in the build env
 FONT_DEFINES	?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2")
-- 
cgit v1.2.3


From 320352d64885fa195ea070428344a7ae2404e535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salvador=20Fandi=C3=B1o?= <sfandino@yahoo.com>
Date: Wed, 31 May 2017 11:44:59 +0200
Subject: Don't force root ownership of dirs when installing

When installing nxcompshad, directory user and group ownership were
forced to be root. That precluded installations by non-root users.

Now, they are not forced.
---
 nxcompshad/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index e14d58312..34b785d25 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -91,7 +91,7 @@ includedir   = @includedir@
 pkgconfigdir = @pkgconfigdir@
 
 INSTALL         = @INSTALL@
-INSTALL_DIR     = $(INSTALL) -d -o root -g root -m 0755 
+INSTALL_DIR     = $(INSTALL) -d -m 0755
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
 INSTALL_LINK    = cp -av
-- 
cgit v1.2.3