[fcoe-utils] Add new, 1.0.19-compatible Makefile.am patch

Petr Sabata psabata at fedoraproject.org
Thu Jun 2 14:18:45 UTC 2011


commit 5f9c39a839a0e4e507ca3d7d55f538d6a7633b2f
Author: Petr Sabata <contyk at redhat.com>
Date:   Thu Jun 2 16:18:34 2011 +0200

    Add new, 1.0.19-compatible Makefile.am patch

 fcoe-utils-1.0.19-make.patch |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/fcoe-utils-1.0.19-make.patch b/fcoe-utils-1.0.19-make.patch
new file mode 100644
index 0000000..46b553f
--- /dev/null
+++ b/fcoe-utils-1.0.19-make.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.am b/Makefile.am
+index c5c99e5..a36cf7c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
+ sbin_PROGRAMS = fcoeadm fcoemon fcping fipvlan fcnsq fcrls
+ 
+ ## all targets should look for headers in the include directory
+-AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include
++AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include
+ ## pass the sysconfdir into the C proprocessor
+ AM_CPPFLAGS += -DSYSCONFDIR="\"${sysconfdir}\""
+ AM_CFLAGS = -Wall
+@@ -66,12 +66,9 @@ init_d_SCRIPTS = etc/initd/fcoe
+ 
+ dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec etc/config
+ 
+-BASH_COMPLETION_DIR=/etc/bash_completion.d/
++BASH_COMPLETION_DIR=${DESTDIR}/etc/bash_completion.d/
+ 
+ install-data-hook:
+-	if [ ! -f ${DESTDIR}${fcoe_configdir}/config ] ; then \
+-		cp ${srcdir}/etc/config ${DESTDIR}${fcoe_configdir}/config; \
+-	fi; \
+ 	if [ ! -d "${BASH_COMPLETION_DIR}" ] ; then \
+ 		mkdir ${BASH_COMPLETION_DIR}; \
+ 	fi; \


More information about the scm-commits mailing list