Commit b4b4e209 authored by Mike Gabriel's avatar Mike Gabriel

Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for macros.

parent 280d8751
...@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low ...@@ -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 * 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 installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of
the Xinerama extension. the Xinerama extension.
* Update patch: 001_add-main-makefile.full+lite.patch, use curly braces for
macros.
[ 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
......
...@@ -9,12 +9,12 @@ Last-Update: 2011-12-31 ...@@ -9,12 +9,12 @@ Last-Update: 2011-12-31
+#!/usr/bin/make -f +#!/usr/bin/make -f
+ +
+%: +%:
+ $(MAKE) -C nxcomp $@ + ${MAKE} -C nxcomp $@
+ $(MAKE) -C nxproxy $@ + ${MAKE} -C nxproxy $@
+ if test -d nx-X11; then \ + if test -d nx-X11; then \
+ $(MAKE) -C nxcompext $@; \ + ${MAKE} -C nxcompext $@; \
+ $(MAKE) -C nxcompshad; \ + ${MAKE} -C nxcompshad; \
+ $(MAKE) -C nx-X11 $@; \ + ${MAKE} -C nx-X11 $@; \
+ fi + fi
+ +
+all: build +all: build
...@@ -23,20 +23,20 @@ Last-Update: 2011-12-31 ...@@ -23,20 +23,20 @@ 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 && ./configure
+ cd nxcompext && autoconf + cd nxcompext && autoconf
+ cd nxcompshad && autoconf + cd nxcompshad && autoconf
+ cd nx-X11 && $(MAKE) World + cd nx-X11 && ${MAKE} World
+ cd nxproxy && autoconf && (${CONFIGURE}) && $(MAKE) + cd nxproxy && autoconf && (${CONFIGURE}) && ${MAKE}
+ +
+build: +build:
+ if ! test -d nx-X11; then \ + if ! test -d nx-X11; then \
+ $(MAKE) build-lite; \ + ${MAKE} build-lite; \
+ else \ + else \
+ $(MAKE) build-full; \ + ${MAKE} build-full; \
+ fi + fi
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