aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-22 22:49:06 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-22 22:49:06 +0100
commit0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2 (patch)
treed10c7648b8e72a5ffcf1dfea8cb5777990ec2425 /debian
parenta8bf2dd819ac55535b11e38848ffc9b076a5d307 (diff)
downloadnx-libs-0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2.tar.gz
nx-libs-0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2.tar.bz2
nx-libs-0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2.zip
Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/001_add-main-makefile.full+lite.patch10
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 295c82e48..f1697bcc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
- * Continue development...
+ * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from
+ packaging. Test for Makefiles in subfolders before calling them.
+ Fixes build failure during ,,make distclean'' calls.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 15:05:38 +0100
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 3c236b9f2..fffa4dc42 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -11,12 +11,12 @@ Last-Update: 2011-12-31
+CONFIGURE=./configure
+
+%:
-+ ${MAKE} -C nxcomp $@
-+ ${MAKE} -C nxproxy $@
++ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
++ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
+ if test -d nx-X11; then \
-+ ${MAKE} -C nxcompext $@; \
-+ ${MAKE} -C nxcompshad; \
-+ ${MAKE} -C nx-X11 $@; \
++ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \
++ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
++ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \
+ fi
+
+all: build