aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-15 12:55:17 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-15 12:55:17 +0100
commit1dad092caf01d733990648e6df64cbf964df5143 (patch)
tree39de0e643e76754a3e23ca9dd0350b8ba4f76250 /debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch
parent6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff)
parent2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff)
downloadnx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz
nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2
nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip
Merge branch '3.6.x'
Diffstat (limited to 'debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch')
-rw-r--r--debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch
deleted file mode 100644
index da7924f81..000000000
--- a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.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/nxcompext/configure.in
-+++ b/nxcompext/configure.in
-@@ -219,18 +219,15 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}
- 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/nxcompext/Makefile.in
-+++ b/nxcompext/Makefile.in
-@@ -144,9 +144,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