diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-26 13:26:47 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-12 23:25:57 +0200 |
| commit | 41ea54b0217175a4b78980671f4c6818eb66b166 (patch) | |
| tree | a3c8b61e118fde6bd78a8dd8a1994d60aa08caaa /Makefile | |
| parent | 322e39b79729bc72bd37265949a04962e427ef0a (diff) | |
| download | nx-libs-41ea54b0217175a4b78980671f4c6818eb66b166.tar.gz nx-libs-41ea54b0217175a4b78980671f4c6818eb66b166.tar.bz2 nx-libs-41ea54b0217175a4b78980671f4c6818eb66b166.zip | |
nxproxy: Switch to autoreconf.
This also solves the last remnant of overlinking as described in GH issue #133.
Fixes ArcticaProject/nx-libs#133.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 5 insertions, 11 deletions
@@ -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 |