diff --git a/pw3270.spec.in b/pw3270.spec.in index ee4ab2c..9aa5ca5 100644 --- a/pw3270.spec.in +++ b/pw3270.spec.in @@ -131,7 +131,7 @@ autoconf export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" export FFLAGS="$RPM_OPT_FLAGS" -%configure +%configure %build make clean @@ -188,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/@PACKAGE_NAME@/sample/* %files plugin-dbus -%{_datadir}/@PACKAGE_NAME@/plugins/dbus3270.so +%{_libdir}/@PACKAGE_NAME@-plugins/dbus3270.so #---[ Scripts ]------------------------------------------------------------------------------------------------------- diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in index d5efe2e..cec2739 100644 --- a/src/plugins/dbus3270/Makefile.in +++ b/src/plugins/dbus3270/Makefile.in @@ -135,8 +135,8 @@ $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $ #---[ Misc targets ]----------------------------------------------------------- install: $(BINRLS)/plugins/$(MODULE_NAME).so - @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins - @$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins + @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins + @$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins debug-service: $(BINDBG)/@PACKAGE_NAME@d diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 8302ddc..f58a140 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -68,7 +68,7 @@ DEPENDS=*.h common/*.h uiparser/*.h v3270/*.h $(GLOBAL_DEPS) VALGRIND=@VALGRIND@ -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include +CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\" -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@ #---[ Rules ]------------------------------------------------------------------ diff --git a/src/pw3270/plugin.c b/src/pw3270/plugin.c index 3fa1b67..18873df 100644 --- a/src/pw3270/plugin.c +++ b/src/pw3270/plugin.c @@ -137,9 +137,22 @@ { #if ! defined(DEBUG) - gchar *path = pw3270_build_filename(widget,"plugins",NULL); - load(path, widget); - g_free(path); + const gchar * appname[] = { g_get_application_name(), PACKAGE_NAME }; + int f; + + for(f=0;f +# Copyright (C) <2008> # # Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob # os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela -- libgit2 0.21.2