Author: asterix Date: 2009-02-11 11:50:39 +0100 (Wed, 11 Feb 2009) New Revision: 11074

Modified: trunk/src/Makefile.am trunk/src/osx/Makefile.am trunk/src/osx/growl/Makefile.am trunk/src/osx/syncmenu/Makefile.am Log: [brubru] replace $(libdir)/gajim by $(pkglibdir) see #4770

Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-02-11 10:46:07 UTC (rev 11073) +++ trunk/src/Makefile.am 2009-02-11 10:50:39 UTC (rev 11074) @@ -8,7 +8,7 @@

if BUILD_GTKSPELL gtkspelllib_LTLIBRARIES = gtkspell.la -gtkspelllibdir = $(libdir)/gajim +gtkspelllibdir = $(pkglibdir)

gtkspell_la_LIBADD = \ $(GTKSPELL_LIBS) $(PYGTK_LIBS) @@ -23,7 +23,7 @@ endif if BUILD_TRAYICON trayiconlib_LTLIBRARIES = trayicon.la -trayiconlibdir = $(libdir)/gajim +trayiconlibdir = $(pkglibdir) trayicon_la_LIBADD = $(PYGTK_LIBS) trayicon_la_SOURCES = \ eggtrayicon.c \

Modified: trunk/src/osx/Makefile.am =================================================================== --- trunk/src/osx/Makefile.am 2009-02-11 10:46:07 UTC (rev 11073) +++ trunk/src/osx/Makefile.am 2009-02-11 10:50:39 UTC (rev 11074) @@ -10,7 +10,7 @@

if BUILD_IDLE_OSX idlelib_LTLIBRARIES = idle.la -idlelibdir = $(libdir)/gajim +idlelibdir = $(pkglibdir)

idle_la_LIBADD = $(CARBON_LIBS)

@@ -24,7 +24,7 @@

if BUILD_COCOA nsapplib_LTLIBRARIES = nsapp.la -nsapplibdir = $(libdir)/gajim +nsapplibdir = $(pkglibdir)

nsapp_la_LIBADD = $(COCOA_LIBS)

Modified: trunk/src/osx/growl/Makefile.am =================================================================== --- trunk/src/osx/growl/Makefile.am 2009-02-11 10:46:07 UTC (rev 11073) +++ trunk/src/osx/growl/Makefile.am 2009-02-11 10:50:39 UTC (rev 11074) @@ -6,7 +6,7 @@

if BUILD_CARBON _growllib_LTLIBRARIES = _growl.la -_growllibdir = $(libdir)/gajim +_growllibdir = $(pkglibdir)

_growl_la_LIBADD = $(CARBON_LIBS)

@@ -20,7 +20,7 @@

if BUILD_COCOA _growlImagelib_LTLIBRARIES = _growlImage.la -_growlImagelibdir = $(libdir)/gajim +_growlImagelibdir = $(pkglibdir)

_growlImage_la_LIBADD = $(COCOA_LIBS)

Modified: trunk/src/osx/syncmenu/Makefile.am =================================================================== --- trunk/src/osx/syncmenu/Makefile.am 2009-02-11 10:46:07 UTC (rev 11073) +++ trunk/src/osx/syncmenu/Makefile.am 2009-02-11 10:50:39 UTC (rev 11074) @@ -8,7 +8,7 @@

if BUILD_COCOA syncmenulib_LTLIBRARIES = syncmenu.la -syncmenulibdir = $(libdir)/gajim +syncmenulibdir = $(pkglibdir) syncmenu_la_SOURCES = sync-menu.c pysyncmenu.c syncmenu_la_LDFLAGS = -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKLDFLAGS) syncmenu_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKCFLAGS) -Wall -g $(INCLUDES)