Mercurial > pidgin.yaz
changeset 27717:48148e688ad1
Some versions of libtool seem to output things a little differently, so
change the automatic plugin-building stuff to copy the right files, and
still be compatible with OS X.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 20 Jul 2009 05:10:17 +0000 |
| parents | 1316f2b180be |
| children | 577bf7ea0395 |
| files | libpurple/plugins/Makefile.am pidgin/plugins/Makefile.am |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/Makefile.am Mon Jul 20 01:28:11 2009 +0000 +++ b/libpurple/plugins/Makefile.am Mon Jul 20 05:10:17 2009 +0000 @@ -157,5 +157,5 @@ $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS) @rm -f tmp$@.lo tmp$@.o libtmp$@.la - @cp .libs/libtmp$@.so.so $@ + @cp .libs/libtmp$@*.so $@ @rm -rf .libs/libtmp$@.*
--- a/pidgin/plugins/Makefile.am Mon Jul 20 01:28:11 2009 +0000 +++ b/pidgin/plugins/Makefile.am Mon Jul 20 05:10:17 2009 +0000 @@ -140,5 +140,5 @@ $(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS) @rm -f tmp$@.lo tmp$@.o libtmp$@.la - @cp .libs/libtmp$@.so.so $@ + @cp .libs/libtmp$@*.so $@ @rm -rf .libs/libtmp$@.*