diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 23:55:38 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 23:55:38 +0000 |
| commit | 9c1133236282fe7bc04d8a04771ccb0f5b93c0e3 (patch) | |
| tree | 2b17219f5d89d47978fb6c335ad3fd85c4c7b4c7 | |
| parent | 0c3509681a09a676fa92978615b3e6c1827a391e (diff) | |
| download | xine-lib-9c1133236282fe7bc04d8a04771ccb0f5b93c0e3.tar.gz xine-lib-9c1133236282fe7bc04d8a04771ccb0f5b93c0e3.tar.bz2 | |
Hack to work around reported "make install" breakage due to cset 722ab5774bce.
The problem appears to be some autotools breakage, but since GNU ld can cope
with "-Wl,--rpath,/usr/local/lib", it can be worked around easily enough with a
little sed magic. However, this means that on affected systems, autoconf can't
be run without breaking things again; fortunately, configure will be
regenerated automatically if needed (due to makefile rules).
Requires "sed -i".
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | autogen.sh | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 551238f94..c585434d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,3 +110,6 @@ maintainer-clean-generic: maintainer-clean-generic-hook: rm -f config.status + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) && $(SED) -i -e '/gnu_ld/,/;;/ s/--rpath \$${wl}/--rpath,/' $@ diff --git a/autogen.sh b/autogen.sh index ac99c9d98..f3ad2a99d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -107,6 +107,7 @@ run_autoconf () { echo $_echo_n " + Running autoconf: $_echo_c"; autoconf; + sed -i -e '/gnu_ld/,/;;/ s/--rpath \${wl}/--rpath,/' configure echo "done." } |