aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/001_add-main-makefile.patch36
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules12
4 files changed, 47 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 318dfc67b..1f893e77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
* Initial release.
* Use NX adapted LD_LIBRARY_PATH in debian/rules.
* Add quilt as build dependency.
+ * Add main Makefile via patch: 001_add-main-makefile.patch.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/001_add-main-makefile.patch b/debian/patches/001_add-main-makefile.patch
new file mode 100644
index 000000000..cd179f01c
--- /dev/null
+++ b/debian/patches/001_add-main-makefile.patch
@@ -0,0 +1,36 @@
+Add main Makefile to build all NX subprojects in this source tree.--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,33 @@
++#!/usr/bin/make -f
++
++all: build
++
++build: build-arch build-indep
++
++clean:
++ cd nx-X11 && test -f Makefile && make $@ || true
++ cd nxcomp && test -f Makefile && make $@ || true
++ cd nxcompext && test -f Makefile && make $@ || true
++ cd nxcompshad && test -f Makefile && make $@ || true
++ cd nxproxy && test -f Makefile && make $@ || true
++
++
++distclean:
++ cd nx-X11 && test -f Makefile && make clean || true
++ cd nxcomp && test -f Makefile && make $@ || true
++ cd nxcompext && test -f Makefile && make $@ || true
++ cd nxcompshad && test -f Makefile && make $@ || true
++ cd nxproxy && test -f Makefile && make $@ || true
++
++build-arch:
++ cd nxcomp && autoconf
++ cd nxcompext && autoconf
++ cd nxcompshad && autoconf
++ cd nx-X11 && make World
++ cd nxproxy && autoconf
++
++build-indep:
++
++install:
++
++uninstall:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..9a8f69823
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_add-main-makefile.patch
diff --git a/debian/rules b/debian/rules
index ca5396072..caf546bd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,16 +9,22 @@ else
endif
%:
- LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@
+ LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt
override_dh_auto_clean:
rm -Rf nx-X11/.build-exports
- LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean
+ LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean --with quilt
override_dh_auto_build:
debian/pre-build-nx.sh
- LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build
+ LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt
debian/post-build-nx.sh
override_dh_auto_install:
+override_dh_quilt_patch:
+ dh_quilt_patch
+ chown a+x Makefile
+
+override_dh_quilt_unpatch:
+ dh_quilt_unpatch