blob: f5e05eba0406f14e270562e15741a19ac113c869 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
Fix bug 150435 - wxrc build fails because it tries to link against system wx libraries, if present,
due to LDFLAGS containing -L to /usr/lib as a symlink - swap $LDFLAGS and $LIBDIRNAME
--- utils/wxrc/Makefile.in.orig 2007-01-10 13:25:40.000000000 +0200
+++ utils/wxrc/Makefile.in 2007-01-10 13:27:56.000000000 +0200
@@ -114,7 +114,7 @@
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)
@COND_USE_XRC_1@
@COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd)
|
GitWeb
