diff options
Diffstat (limited to 'debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch')
| -rw-r--r-- | debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch deleted file mode 100644 index a8d83666a..000000000 --- a/debian/patches/0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) -Author: Clemens Lang <cal@macports.org> - v2: Mihai Moldovan <ionic@ionic.de> - ---- a/nxcomp/configure.in -+++ b/nxcomp/configure.in -@@ -362,18 +362,15 @@ fi - dnl Find makedepend somewhere. - - AC_SUBST(MAKEDEPEND) -+MAKEDEPEND="$(which makedepend)" - --if test -x "../nx-X11/config/makedepend/makedepend" ; then -- MAKEDEPEND=../nx-X11/config/makedepend/makedepend --else -- if test -x "/usr/X11R6/bin/makedepend" ; then -- MAKEDEPEND=/usr/X11R6/bin/makedepend -- else -- if test -x "/usr/openwin/bin/makedepend" ; then -- MAKEDEPEND=/usr/openwin/bin/makedepend -- else -- MAKEDEPEND=/usr/bin/makedepend -- fi -+# Try to desperately find makedepend. -+# Set MAKEDEPEND to the shipped makedepend binary. This will not -+# exist in nx-libs-lite, though, in which case MAKEDEPEND -+# will stay empty. -+if test -z "${MAKEDEPEND}"; then -+ if test -x "../nx-X11/config/makedepend/makedepend"; then -+ MAKEDEPEND="../nx-X11/config/makedepend/makedepend" - fi - fi - ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -263,9 +263,9 @@ depends: depend.status - depend: depend.status - - depend.status: -- if [ -x $(MAKEDEPEND) ] ; then \ -+ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ - $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ -- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ -+ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ - $(CXXSRC) 2>/dev/null; \ - fi - touch depend.status |