aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/001_add-main-makefile.full+lite.patch22
2 files changed, 13 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 0ca2fee3e..e7401d194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Do not install libXinerama directly into /usr/lib/nx. Recommended method is
installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of
the Xinerama extension.
+ * Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for
+ macros.
[ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 7f79277d7..9f4351f91 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -9,12 +9,12 @@ Last-Update: 2011-12-31
+#!/usr/bin/make -f
+
+%:
-+ $(MAKE) -C nxcomp $@
-+ $(MAKE) -C nxproxy $@
++ ${MAKE} -C nxcomp $@
++ ${MAKE} -C nxproxy $@
+ if test -d nx-X11; then \
-+ $(MAKE) -C nxcompext $@; \
-+ $(MAKE) -C nxcompshad; \
-+ $(MAKE) -C nx-X11 $@; \
++ ${MAKE} -C nxcompext $@; \
++ ${MAKE} -C nxcompshad; \
++ ${MAKE} -C nx-X11 $@; \
+ fi
+
+all: build
@@ -23,20 +23,20 @@ Last-Update: 2011-12-31
+ echo "No testing for NX (redistributed)"
+
+build-lite:
-+ cd nxcomp && autoconf && ./configure && $(MAKE)
-+ cd nxproxy && autoconf && ./configure && $(MAKE)
++ cd nxcomp && autoconf && ./configure && ${MAKE}
++ cd nxproxy && autoconf && ./configure && ${MAKE}
+
+build-full:
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+ cd nxcomp && autoconf && ./configure
+ cd nxcompext && autoconf
+ cd nxcompshad && autoconf
-+ cd nx-X11 && $(MAKE) World
-+ cd nxproxy && autoconf && (${CONFIGURE}) && $(MAKE)
++ cd nx-X11 && ${MAKE} World
++ cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
+
+build:
+ if ! test -d nx-X11; then \
-+ $(MAKE) build-lite; \
++ ${MAKE} build-lite; \
+ else \
-+ $(MAKE) build-full; \
++ ${MAKE} build-full; \
+ fi