aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/irda-utils
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2009-06-13 13:22:23 +0100
committerPhil Blundell <philb@gnu.org>2009-06-13 13:22:23 +0100
commit17f3b570cff78118d493acf16af99cb6b99f4393 (patch)
treef07e20c97356335b411e50a11c87ed447f5c9e8e /recipes/irda-utils
parentf725a81c0494aa40a5d6e5f1bd3ee43209da287b (diff)
downloadopenembedded-17f3b570cff78118d493acf16af99cb6b99f4393.tar.gz
openembedded-17f3b570cff78118d493acf16af99cb6b99f4393.tar.bz2
openembedded-17f3b570cff78118d493acf16af99cb6b99f4393.zip
irda-utils: respect $(sbindir)
Diffstat (limited to 'recipes/irda-utils')
-rw-r--r--recipes/irda-utils/irda-utils/sbindir.patch38
-rw-r--r--recipes/irda-utils/irda-utils_0.9.16.bb5
2 files changed, 41 insertions, 2 deletions
diff --git a/recipes/irda-utils/irda-utils/sbindir.patch b/recipes/irda-utils/irda-utils/sbindir.patch
new file mode 100644
index 0000000000..b14c92f25a
--- /dev/null
+++ b/recipes/irda-utils/irda-utils/sbindir.patch
@@ -0,0 +1,38 @@
+diff -upr irda-utils-0.9.16.old/irattach/Makefile irda-utils-0.9.16/irattach/Makefile
+--- irda-utils-0.9.16.old/irattach/Makefile 2009-06-13 12:54:18.000000000 +0100
++++ irda-utils-0.9.16/irattach/Makefile 2009-06-13 12:51:58.000000000 +0100
+@@ -62,8 +62,8 @@ dongle_attach: dongle_attach.o
+ $(CC) $(CFLAGS) $(INCLUDES) -c $<
+
+ install: $(TARGETS)
+- install irattach $(ROOT)/usr/sbin
+- install dongle_attach $(ROOT)/usr/sbin
++ install irattach $(ROOT)$(sbindir)
++ install dongle_attach $(ROOT)$(sbindir)
+
+ clean:
+ $(RM_CMD)
+diff -upr irda-utils-0.9.16.old/irdaping/Makefile irda-utils-0.9.16/irdaping/Makefile
+--- irda-utils-0.9.16.old/irdaping/Makefile 2009-06-13 12:54:18.000000000 +0100
++++ irda-utils-0.9.16/irdaping/Makefile 2009-06-13 12:52:15.000000000 +0100
+@@ -58,7 +58,7 @@ irdaping: $(OBJS)
+ $(CC) $(CFLAGS) $(INCLUDES) -c $<
+
+ install: all
+- install irdaping $(ROOT)/usr/sbin
++ install irdaping $(ROOT)$(sbindir)
+
+ clean::
+ $(RM_CMD)
+diff -upr irda-utils-0.9.16.old/Makefile irda-utils-0.9.16/Makefile
+--- irda-utils-0.9.16.old/Makefile 2004-03-31 22:55:40.000000000 +0100
++++ irda-utils-0.9.16/Makefile 2009-06-13 12:51:37.000000000 +0100
+@@ -40,7 +40,7 @@ all:
+
+ install:
+ for i in $(DIRS); do \
+- cd $$i;make install; cd ..; \
++ cd $$i;make bindir="$(bindir)" sbindir="$(sbindir)" install; cd ..; \
+ done
+
+ clean:
diff --git a/recipes/irda-utils/irda-utils_0.9.16.bb b/recipes/irda-utils/irda-utils_0.9.16.bb
index 1d9d184a9b..d5c36f650e 100644
--- a/recipes/irda-utils/irda-utils_0.9.16.bb
+++ b/recipes/irda-utils/irda-utils_0.9.16.bb
@@ -9,6 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
file://configure.patch;patch=1 \
file://m4.patch;patch=1 \
file://ldflags.patch;patch=1 \
+ file://sbindir.patch;patch=1 \
file://init"
export SYS_INCLUDES="-I${STAGING_INCDIR}"
@@ -25,8 +26,8 @@ do_compile () {
do_install () {
install -d ${D}${sbindir}
- oe_runmake -C irattach ROOT="${D}" install
- oe_runmake -C irdaping ROOT="${D}" install
+ oe_runmake -C irattach ROOT="${D}" sbindir="${sbindir}" install
+ oe_runmake -C irdaping ROOT="${D}" sbindir="${sbindir}" install
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}