aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 15:22:03 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 15:22:03 +0100
commitae565e1da04b8e01d4cef1a09eca96af23cecb5c (patch)
tree35c4c49e717b6ea72b20b2a902475027e3a9e6a3 /Makefile
parentdf79c3b35a30a957be0125c42e766a7ea2f51123 (diff)
parent6812657f04d0e9a1e2fe92c0180f482a693df9ec (diff)
downloadnx-libs-ae565e1da04b8e01d4cef1a09eca96af23cecb5c.tar.gz
nx-libs-ae565e1da04b8e01d4cef1a09eca96af23cecb5c.tar.bz2
nx-libs-ae565e1da04b8e01d4cef1a09eca96af23cecb5c.zip
Merge branch 'sunweaver-pr/nxdialog-autotools' into 3.6.x
Attributes GH PR #789: https://github.com/ArcticaProject/nx-libs/pull/789 Approved by Ulrich Sibiller <uli42@gmx.de>, Fri, 01 Mar 2019 05:41:23 -0800
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2fa75d3fc..0657bcb7d 100644
--- a/Makefile
+++ b/Makefile
@@ -170,6 +170,9 @@ build-full: build-env
# build nxproxy fifth
cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+ # "build" nxdialog last
+ cd nxdialog && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+
build:
if ! test -d nx-X11; then \
${MAKE} build-lite; \
@@ -247,6 +250,9 @@ install-full:
$(MAKE) -C nx-X11/lib install
+ # install the nxdialog executable and its man page
+ $(MAKE) -C nxdialog install
+
uninstall:
$(MAKE) uninstall-lite
[ ! -d nx-X11 ] || $(MAKE) uninstall-full
@@ -269,3 +275,5 @@ uninstall-full:
$(RM_DIR_REC) $(DESTDIR)$(NXLIBDIR)
$(RM_DIR_REC) $(DESTDIR)$(INCLUDEDIR)/nx
+
+ test -f nxdialog/Makefile && ${MAKE} -C nxdialog "$@"