aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2012-02-14 08:26:50 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 08:27:12 +0100
commit448a1db30bd68025dea51ea98a52a16658f6f03c (patch)
treeffea8271adfad947cf6bd3bdf616a44e018969d7 /debian
parentb087877b25af2c3ed9cd405fd1c867c8817223e9 (diff)
downloadnx-libs-448a1db30bd68025dea51ea98a52a16658f6f03c.tar.gz
nx-libs-448a1db30bd68025dea51ea98a52a16658f6f03c.tar.bz2
nx-libs-448a1db30bd68025dea51ea98a52a16658f6f03c.zip
Update patch: 001_add-main-makefile.full+lite.patch, allow passing of configure args.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/001_add-main-makefile.full+lite.patch2
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 35df3c165..b57aaa051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
+ [ Mike Gabriel ]
* Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
make build stanza work for nx-libs-full and nx-libs-lite.
* 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.
+ [ Jan Engelhardt ]
+ * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of configure args.
+
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
nx-libs (2:3.5.0.10-0) unstable; urgency=low
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index f10144608..7f79277d7 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -32,7 +32,7 @@ Last-Update: 2011-12-31
+ cd nxcompext && autoconf
+ cd nxcompshad && autoconf
+ cd nx-X11 && $(MAKE) World
-+ cd nxproxy && autoconf && ./configure && $(MAKE)
++ cd nxproxy && autoconf && (${CONFIGURE}) && $(MAKE)
+
+build:
+ if ! test -d nx-X11; then \