diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-06 14:29:20 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-06 14:29:20 +0200 |
| commit | 7b00b7bb8dbf1dc680d1a7b52b425270c95adad7 (patch) | |
| tree | acd59cf9a20e77e1fae5dc73ed0c30ff3926c2eb | |
| parent | 04fbb27267485c287752972e1a9ccf0c7f07aae9 (diff) | |
| parent | 320352d64885fa195ea070428344a7ae2404e535 (diff) | |
| download | nx-libs-7b00b7bb8dbf1dc680d1a7b52b425270c95adad7.tar.gz nx-libs-7b00b7bb8dbf1dc680d1a7b52b425270c95adad7.tar.bz2 nx-libs-7b00b7bb8dbf1dc680d1a7b52b425270c95adad7.zip | |
Merge branch 'salva-install-as-non-root' into 3.6.x
Attributes GH PR #464: https://github.com/ArcticaProject/nx-libs/pull/464
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | nxcompshad/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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") 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 |