Skip to content

N
nx-libs
Unverified Commit 7b00b7bb authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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

Attributes GH PR #464: https://github.com/ArcticaProject/nx-libs/pull/464
parents 04fbb272 320352d6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ 7b00b7bb
......@@ -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")
......
nxcompshad/Makefile.in
View file @ 7b00b7bb
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment