Merge branch 'salva-install-as-non-root' into 3.6.x

Attributes GH PR #464: https://github.com/ArcticaProject/nx-libs/pull/464

Merge branch 'salva-install-as-non-root' into 3.6.x
7b00b7bb · Mike Gabriel · 04fbb272 · 320352d6 · 7b00b7bb · 7b00b7bb
Unverified Commit 7b00b7bb authored Jun 06, 2017 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile Makefile +1 -1

Makefile.in nxcompshad/Makefile.in +1 -1

No files found.
--- 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")

--- 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