File 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch of Package OpenIPMI
Index: OpenIPMI-2.0.24/Makefile.am =================================================================== --- OpenIPMI-2.0.24.orig/Makefile.am +++ OpenIPMI-2.0.24/Makefile.am @@ -1,10 +1,10 @@ RPM = rpmbuild RPMFLAGS = -ta -SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \ +SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \ ui lanserv sample doc man $(SWIG_DIR) -DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \ +DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \ ui lanserv sample doc man swig EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ Index: OpenIPMI-2.0.24/cmdlang/Makefile.am =================================================================== --- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am +++ OpenIPMI-2.0.24/cmdlang/Makefile.am @@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ + -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ + $(EDIT_CFLAGS) \ $(TCL_CFLAGS) lib_LTLIBRARIES = libOpenIPMIcmdlang.la @@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la \ $(top_builddir)/unix/libOpenIPMIposix.la \ - $(top_builddir)/libedit/libedit.a \ + $(EDIT_LIBS) \ $(TERM_LIBS) \ $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ $(TCL_LIB) $(TCL_LIBS) \ Index: OpenIPMI-2.0.24/configure.ac =================================================================== --- OpenIPMI-2.0.24.orig/configure.ac +++ OpenIPMI-2.0.24/configure.ac @@ -878,7 +878,6 @@ AC_OUTPUT(Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile - libedit/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile Index: OpenIPMI-2.0.24/sample/Makefile.am =================================================================== --- OpenIPMI-2.0.24.orig/sample/Makefile.am +++ OpenIPMI-2.0.24/sample/Makefile.am @@ -71,9 +71,9 @@ rmcp_ping_SOURCES = rmcp_ping.c rmcp_ping_LDADD = $(SOCKETLIB) ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c -ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) \ +ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) $(TERM_LIBS) \ $(SOCKETLIB) -ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit +ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS) EXTRA_DIST = example_oem.c
