aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-14 15:18:22 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-14 15:18:22 +0100
commite4a7baf15897377788a9df93d59521fa307af519 (patch)
tree94f2ad63f2adc6fd09fdab52efb4ae099068da73
parenta118ab80123b6b87defa9ee3718552ac8e99bc67 (diff)
downloadnx-libs-e4a7baf15897377788a9df93d59521fa307af519.tar.gz
nx-libs-e4a7baf15897377788a9df93d59521fa307af519.tar.bz2
nx-libs-e4a7baf15897377788a9df93d59521fa307af519.zip
Regression fix for a93f64e4. The test executables bails out on test failure, whereas ifdef does not. Adding "|| true" where needed.
-rw-r--r--Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 9800f8313..ada87517d 100644
--- a/Makefile
+++ b/Makefile
@@ -62,18 +62,18 @@ NX_XTRANS_HEADERS = \
all: build
clean:
- test -f nxcomp/Makefile && ${MAKE} -C nxcomp clean
- test -f nxproxy/Makefile && ${MAKE} -C nxproxy clean
- test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean
- test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean
- test -d nx-X11 && ${MAKE} clean-env
+ test -f nxcomp/Makefile && ${MAKE} -C nxcomp clean || true
+ test -f nxproxy/Makefile && ${MAKE} -C nxproxy clean || true
+ test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean || true
+ test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean || true
+ test -d nx-X11 && ${MAKE} clean-env || true
distclean: clean
- test -f nxcomp/Makefile && ${MAKE} -C nxcomp distclean
- test -f nxproxy/Makefile && ${MAKE} -C nxproxy distclean
- test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean
- test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad distclean
- test -d nx-X11 && ${MAKE} -C nx-X11 distclean
+ test -f nxcomp/Makefile && ${MAKE} -C nxcomp distclean || true
+ test -f nxproxy/Makefile && ${MAKE} -C nxproxy distclean || true
+ test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean || true
+ test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad distclean || true
+ test -d nx-X11 && ${MAKE} -C nx-X11 distclean || true
test -x ./mesa-quilt && ./mesa-quilt pop -a
$(RM_DIR_REC) nx-X11/extras/Mesa/.pc/
$(RM_FILE) nx-X11/config/cf/nxversion.def