Misplaced plugins

[Jeremy Laine]

Hello,

There seem to be a couple of plugins in KDevelop 3.2.2 that are 
incorrectly declared as lib_LTLIBRARIES instead of 
kde_module_LTLIBRARIES, which means they get installed straight into 
/usr/lib.

Attached are two patches (against 3.2.2) that fix this.

Cheers,
Jeremy

-- 
http://www.jerryweb.org/             : JerryWeb.org
http://sailcut.sourceforge.net/      : Sailcut CAD
http://opensource.polytechnique.org/ : Polytechnique.org Free Software

-------------- next part --------------
diff -urN kdevelop-3.3.2.orig/languages/cpp/pcsimporter/customimporter/Makefile.am kdevelop-3.3.2/languages/cpp/pcsimporter/customimporter/Makefile.am
--- kdevelop-3.3.2.orig/languages/cpp/pcsimporter/customimporter/Makefile.am	2005-09-10 10:22:28.000000000 +0200
+++ kdevelop-3.3.2/languages/cpp/pcsimporter/customimporter/Makefile.am	2006-05-03 07:14:50.000000000 +0200
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-lib_LTLIBRARIES =  libkdevcustompcsimporter.la
+kde_module_LTLIBRARIES =  libkdevcustompcsimporter.la
 
 
 noinst_HEADERS =  kdevcustomimporter.h
diff -urN kdevelop-3.3.2.orig/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am kdevelop-3.3.2/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am
--- kdevelop-3.3.2.orig/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am	2005-09-10 10:22:28.000000000 +0200
+++ kdevelop-3.3.2/languages/cpp/pcsimporter/kdelibsimporter/Makefile.am	2006-05-03 07:15:05.000000000 +0200
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-lib_LTLIBRARIES =  libkdevkdelibsimporter.la
+kde_module_LTLIBRARIES =  libkdevkdelibsimporter.la
 
 noinst_HEADERS = kdevkdelibsimporter.h settingsdialog.h
 libkdevkdelibsimporter_la_SOURCES = kdevkdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
diff -urN kdevelop-3.3.2.orig/languages/cpp/pcsimporter/qtimporter/Makefile.am kdevelop-3.3.2/languages/cpp/pcsimporter/qtimporter/Makefile.am
--- kdevelop-3.3.2.orig/languages/cpp/pcsimporter/qtimporter/Makefile.am	2005-09-10 10:22:28.000000000 +0200
+++ kdevelop-3.3.2/languages/cpp/pcsimporter/qtimporter/Makefile.am	2006-05-03 07:15:16.000000000 +0200
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-lib_LTLIBRARIES =  libkdevqtimporter.la
+kde_module_LTLIBRARIES =  libkdevqtimporter.la
 
 noinst_HEADERS = kdevqtimporter.h settingsdialog.h
 libkdevqtimporter_la_SOURCES = kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-------------- next part --------------
diff -urN kdevelop-3.3.2.orig/buildtools/projectmanager/builders/makebuilder/Makefile.am kdevelop-3.3.2/buildtools/projectmanager/builders/makebuilder/Makefile.am
--- kdevelop-3.3.2.orig/buildtools/projectmanager/builders/makebuilder/Makefile.am	2005-09-10 10:21:41.000000000 +0200
+++ kdevelop-3.3.2/buildtools/projectmanager/builders/makebuilder/Makefile.am	2006-05-04 11:53:37.000000000 +0200
@@ -5,7 +5,7 @@
     
 METASOURCES = AUTO
 
-lib_LTLIBRARIES = \
+kde_module_LTLIBRARIES = \
     libkdevmakebuilder.la
 
 noinst_HEADERS = \
diff -urN kdevelop-3.3.2.orig/buildtools/projectmanager/importers/automake/Makefile.am kdevelop-3.3.2/buildtools/projectmanager/importers/automake/Makefile.am
--- kdevelop-3.3.2.orig/buildtools/projectmanager/importers/automake/Makefile.am	2005-09-10 10:21:40.000000000 +0200
+++ kdevelop-3.3.2/buildtools/projectmanager/importers/automake/Makefile.am	2006-05-04 11:52:08.000000000 +0200
@@ -7,7 +7,7 @@
     
 METASOURCES = AUTO
 
-lib_LTLIBRARIES = \
+kde_module_LTLIBRARIES = \
     libkdevautomakeimporter.la
 
 noinst_HEADERS = \
diff -urN kdevelop-3.3.2.orig/buildtools/projectmanager/importers/custom/Makefile.am kdevelop-3.3.2/buildtools/projectmanager/importers/custom/Makefile.am
--- kdevelop-3.3.2.orig/buildtools/projectmanager/importers/custom/Makefile.am	2005-09-10 10:21:40.000000000 +0200
+++ kdevelop-3.3.2/buildtools/projectmanager/importers/custom/Makefile.am	2006-05-04 11:52:43.000000000 +0200
@@ -7,7 +7,7 @@
     
 METASOURCES = AUTO
 
-lib_LTLIBRARIES = \
+kde_module_LTLIBRARIES = \
     libkdevcustomimporter.la
 
 noinst_HEADERS = \
diff -urN kdevelop-3.3.2.orig/buildtools/projectmanager/importers/qmake/Makefile.am kdevelop-3.3.2/buildtools/projectmanager/importers/qmake/Makefile.am
--- kdevelop-3.3.2.orig/buildtools/projectmanager/importers/qmake/Makefile.am	2005-09-10 10:21:40.000000000 +0200
+++ kdevelop-3.3.2/buildtools/projectmanager/importers/qmake/Makefile.am	2006-05-04 11:52:21.000000000 +0200
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/buildtools/lib/parsers/qmake \
 	-I$(top_srcdir)/buildtools/projectmanager/interfaces -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-lib_LTLIBRARIES = libqmakeimporter.la
+kde_module_LTLIBRARIES = libqmakeimporter.la
 libqmakeimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 noinst_HEADERS = kdevqmakeeditor.h qmakeprojectmodel.h modelcreator.h \
 	projectconfigurationdlg.h