diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/001_add-main-makefile.full+lite.patch | 50 |
2 files changed, 27 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog index f1e90e2c8..72fb0f798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ nx-libs (2:3.5.0.8-0) UNRELEASED; urgency=low * Reorganize patch names, to reflect patch inclusion into lite+full or full-only ,,NX (redistributed)'' tarball. + * Update patch: 001_add-main-makefile.full+lite.patch, only build, install, + clean etc. NX subprojects if the folder exists. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 16 Jan 2012 22:28:13 +0100 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index df3f4e71f..533ce7e25 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -13,39 +13,39 @@ Last-Update: 2011-12-31 +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 ++ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true ++ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true ++ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true ++ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true ++ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true + + +distclean: -+ 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 ++ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true ++ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true ++ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true ++ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true ++ test -d nxproxy && 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 && ./configure && make ++ test -d nxcomp && cd nxcomp && autoconf ++ test -d nxcompext && cd nxcompext && autoconf ++ test -d nxcompshad && cd nxcompshad && autoconf ++ test -d nx-X11 && cd nx-X11 && make World ++ test -d nxproxy && cd nxproxy && autoconf && ./configure && make + +build-indep: + +install: -+ cd nxcomp && make install -+ cd nxcompext && make install -+ cd nxcompshad && make install -+ cd nx-X11 && make install -+ cd nxproxy && make install ++ test -d nxcomp && cd nxcomp && make install ++ test -d nxcompext && cd nxcompext && make install ++ test -d nxcompshad && cd nxcompshad && make install ++ test -d nx-X11 && cd nx-X11 && make install ++ test -d nxproxy && cd nxproxy && make install + +uninstall: -+ cd nxcomp && make uninstall -+ cd nxcompext && make uninstall -+ cd nxcompshad && make uninstall -+ cd nx-X11 && make uninstall -+ cd nxproxy && make uninstall ++ test -d nxcomp && cd nxcomp && make uninstall ++ test -d nxcompext && cd nxcompext && make uninstall ++ test -d nxcompshad && cd nxcompshad && make uninstall ++ test -d nx-X11 && cd nx-X11 && make uninstall ++ test -d nxproxy && cd nxproxy && make uninstall |