diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-03-16 03:04:21 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-16 03:08:44 +0100 |
| commit | 06b51cc33dccbc8efd47e8449b19439c50f33b1e (patch) | |
| tree | a8fdf50ee71404995cf0b032cbcfb32c84461d6a /debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch | |
| parent | 91f1fed27236f0fa880971fc4cad13e95c794afc (diff) | |
| download | nx-libs-06b51cc33dccbc8efd47e8449b19439c50f33b1e.tar.gz nx-libs-06b51cc33dccbc8efd47e8449b19439c50f33b1e.tar.bz2 nx-libs-06b51cc33dccbc8efd47e8449b19439c50f33b1e.zip | |
nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available.
Also rename to account for dependency changes:
- 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch =>
0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch
- 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch =>
0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
- 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch =>
0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
- 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch =>
0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
- 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch =>
0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
- 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch =>
0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
- 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
=>
0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
- 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
=>
0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
Diffstat (limited to 'debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch')
| -rw-r--r-- | debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch new file mode 100644 index 000000000..329a48937 --- /dev/null +++ b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch @@ -0,0 +1,47 @@ +Description: Discover makedepend in $PATH. Especially important for MacPorts (OS X.) +Author: Clemens Lang <cal@macports.org> + v2: Mihai Moldovan <ionic@ionic.de> + +--- a/nxcompshad/configure.in ++++ b/nxcompshad/configure.in +@@ -269,18 +269,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=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/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -179,9 +179,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) $(CXXSRC) 2>/dev/null; \ ++ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ + fi + touch depend.status + |