aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-07-12 23:56:42 +0200
committerMihai Moldovan <ionic@ionic.de>2017-07-12 23:56:42 +0200
commit06bf2a492daa0a95b0faa58f2e0508f2ed262f92 (patch)
treeac8470b67015f42fc031839a9ff700bca5cec7d3 /Makefile
parente17207f183ea031d21a65ba31b026f9d0178afb6 (diff)
parent397d3ac06a83a94606be75daaeb2aba056ad4254 (diff)
downloadnx-libs-06bf2a492daa0a95b0faa58f2e0508f2ed262f92.tar.gz
nx-libs-06bf2a492daa0a95b0faa58f2e0508f2ed262f92.tar.bz2
nx-libs-06bf2a492daa0a95b0faa58f2e0508f2ed262f92.zip
Merge branch 'sunweaver-pr/nxproxy-autoreconf' into 3.6.x
Attributes GH PR #473: https://github.com/ArcticaProject/nx-libs/pull/473 Fixes: ArcticaProject/nx-libs#133
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 7103efb34..6fb11333c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ SHLIBDIR ?= $(LIBDIR)
NXLIBDIR ?= $(SHLIBDIR)/nx
USRLIBDIR ?= $(NXLIBDIR)/X11
INCLUDEDIR ?= $(PREFIX)/include
-CONFIGURE ?= ./configure --prefix=$(DESTDIR)$(PREFIX)
+CONFIGURE ?= ./configure --prefix=$(DESTDIR)$(PREFIX) --libexecdir=$(NXLIBDIR)/bin
# use Xfont2 if available in the build env
FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2")
@@ -56,7 +56,7 @@ test:
build-lite:
cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
- cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
+ cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
build-full:
# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
@@ -84,7 +84,7 @@ build-full:
cd nx-X11 && ${MAKE} World USRLIBDIR=$(USRLIBDIR) SHLIBDIR=$(SHLIBDIR) FONT_DEFINES=$(FONT_DEFINES) XFONTLIB=$(XFONTLIB)
- cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
+ cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
build:
if ! test -d nx-X11; then \
@@ -106,14 +106,8 @@ install-lite:
sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxproxy.in > bin/nxproxy
$(INSTALL_PROGRAM) bin/nxproxy $(DESTDIR)$(BINDIR)
- # FIXME: the below install logic should work via nxproxy/Makefile.in
- # overriding for now...
- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
- $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
-
- $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
- $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/
- gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
+ # install the nxproxy executable and its man page
+ $(MAKE) -C nxproxy install
install-full:
# install nxagent wrapper script