File fix-cmci-include-path.patch of Package sblim-cmpi-pec

Overview Repositories Revisions Requests Users Attributes Meta

File fix-cmci-include-path.patch of Package sblim-cmpi-pec (Revision 1afe08add1349dd9e0141942426cbe93)

Currently displaying revision 1afe08add1349dd9e0141942426cbe93 , Show latest

diff -wruN -x '*~' ../orig-sblim-cmpi-pec-1.0.1/client/Makefile.am ./client/Makefile.am
--- ../orig-sblim-cmpi-pec-1.0.1/client/Makefile.am	2010-01-06 23:14:28.000000000 +0100
+++ ./client/Makefile.am	2010-07-27 17:02:25.000000000 +0200
@@ -4,29 +4,29 @@
 
 pectest_SOURCES = pectest.c
 
-pectest_LDADD = /usr/local/lib/libcmpisfcc.a /usr/local/lib/libcimcclient.a libpec_configurationmanagement.la
+pectest_LDADD = libpec_configurationmanagement.la
 
-pectest_LDFLAGS = -ldl
+pectest_LDFLAGS = -lcmpisfcc -lcimcclient -ldl
 
-pectest_CFLAGS = -I/usr/local/include/CimClientLib
+pectest_CFLAGS = -I/usr/include/CimClientLib
 
 
 peciterativetest_SOURCES = peciterativetest.c
 
-peciterativetest_LDADD = /usr/local/lib/libcmpisfcc.a /usr/local/lib/libcimcclient.a libpec_configurationmanagement.la
+peciterativetest_LDADD = libpec_configurationmanagement.la
 
-peciterativetest_LDFLAGS = -ldl
+peciterativetest_LDFLAGS = -lcmpisfcc -lcimcclient -ldl
 
-peciterativetest_CFLAGS = -I/usr/local/include/CimClientLib
+peciterativetest_CFLAGS = -I/usr/include/CimClientLib
 
 
 pecconfigure_SOURCES = pecconfigure.c
 
-pecconfigure_LDADD = /usr/local/lib/libcmpisfcc.a /usr/local/lib/libcimcclient.a libpec_configurationmanagement.la
+pecconfigure_LDADD = libpec_configurationmanagement.la
 
-pecconfigure_LDFLAGS = -ldl
+pecconfigure_LDFLAGS = -lcmpisfcc -lcimcclient -ldl
 
-pecconfigure_CFLAGS = -I/usr/local/include/CimClientLib
+pecconfigure_CFLAGS = -I/usr/include/CimClientLib
 
 noinst_LTLIBRARIES = libpec_configurationmanagement.la
 
@@ -35,5 +35,5 @@
 libpec_configurationmanagement_la_CFLAGS = -D'INSTDIR="$(prefix)"'
 
 install:
-	mkdir -p ${prefix}/etc
-	cp pec.conf ${prefix}/etc
+	mkdir -p $(DESTDIR)/etc
+	cp pec.conf $(DESTDIR)/etc
diff -wruN -x '*~' ../orig-sblim-cmpi-pec-1.0.1/provider/Makefile.am ./provider/Makefile.am
--- ../orig-sblim-cmpi-pec-1.0.1/provider/Makefile.am	2010-01-06 23:14:28.000000000 +0100
+++ ./provider/Makefile.am	2010-07-27 16:52:39.000000000 +0200
@@ -6,20 +6,20 @@
 
 libpec_plugin_indication_la_LIBADD = libpec_plugins.la
 
-libpec_plugin_indication_la_CFLAGS = -D'DATADIR="$(datadir)"' -I/usr/local/include/cmpi
+libpec_plugin_indication_la_CFLAGS = -D'DATADIR="$(datadir)"' -I/usr/include/cmpi
 
 noinst_LTLIBRARIES = libpec_plugins.la
 
 libpec_plugins_la_SOURCES = pec_plugins.c pec_plugins.h
 
-libpec_plugins_la_CFLAGS = -I/usr/local/include/cmpi 
+libpec_plugins_la_CFLAGS = -I/usr/include/cmpi 
 
 if DEBUG
 libpec_plugins_la_CFLAGS += -D'DEBUG'
 endif
 
 install:
-	mkdir -p ${prefix}/lib/cmpi
-	cp .libs/libpec_plugin_indication.so  ${prefix}/lib/cmpi
+	mkdir -p $(DESTDIR)${prefix}/${LIB}/cmpi
+	cp .libs/libpec_plugin_indication.so $(DESTDIR)${prefix}/${LIB}/cmpi
 
 
diff -wruN -x '*~' ../orig-sblim-cmpi-pec-1.0.1/provider/pec_plugin_indication.c ./provider/pec_plugin_indication.c
--- ../orig-sblim-cmpi-pec-1.0.1/provider/pec_plugin_indication.c	2009-03-14 01:24:55.000000000 +0100
+++ ./provider/pec_plugin_indication.c	2010-07-27 17:04:15.000000000 +0200
@@ -612,13 +612,14 @@
                                           const CMPIContext *ctx) 
 {
     indicationsEnabled  = 1;
-    
+    CMReturn(CMPI_RC_OK);
 }
 
 static CMPIStatus PECPluginDisableIndications(CMPIIndicationMI *mi, 
                                            const CMPIContext *ctx)
 {
     indicationsEnabled  = 0;
+    CMReturn(CMPI_RC_OK);
 }
 
 static CMPIStatus PECPluginIndicationCleanup(CMPIIndicationMI *mi,

Places

File fix-cmci-include-path.patch of Package sblim-cmpi-pec (Revision 1afe08add1349dd9e0141942426cbe93)

Places