Commit 9282c00e authored by Mike Gabriel's avatar Mike Gabriel

Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE) variable.

parent 6a96ae45
...@@ -14,6 +14,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low ...@@ -14,6 +14,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script
currently requires ,,full'' or ,,full+lite'' in the file name. currently requires ,,full'' or ,,full+lite'' in the file name.
* Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...).
* Update patch: 001_add-main-makefile.full+lite.patch, fix missing $(CONFIGURE)
variable.
[ Jan Engelhardt ] [ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
......
...@@ -5,9 +5,11 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> ...@@ -5,9 +5,11 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2011-12-31 Last-Update: 2011-12-31
--- /dev/null --- /dev/null
+++ b/Makefile +++ b/Makefile
@@ -0,0 +1,34 @@ @@ -0,0 +1,36 @@
+#!/usr/bin/make -f +#!/usr/bin/make -f
+ +
+CONFIGURE=./configure
+
+%: +%:
+ ${MAKE} -C nxcomp $@ + ${MAKE} -C nxcomp $@
+ ${MAKE} -C nxproxy $@ + ${MAKE} -C nxproxy $@
...@@ -23,12 +25,12 @@ Last-Update: 2011-12-31 ...@@ -23,12 +25,12 @@ Last-Update: 2011-12-31
+ echo "No testing for NX (redistributed)" + echo "No testing for NX (redistributed)"
+ +
+build-lite: +build-lite:
+ cd nxcomp && autoconf && ./configure && ${MAKE} + cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
+ cd nxproxy && autoconf && ./configure && ${MAKE} + cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
+ +
+build-full: +build-full:
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... +# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+ cd nxcomp && autoconf && ./configure + cd nxcomp && autoconf
+ cd nxcompext && autoconf + cd nxcompext && autoconf
+ cd nxcompshad && autoconf + cd nxcompshad && autoconf
+ cd nx-X11 && ${MAKE} World + cd nx-X11 && ${MAKE} World
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment