package/hplip/hplip-fix-make.patch

   1 From 6019d012246578ae1a191d3510284e7b894fb528 Mon Sep 17 00:00:00 2001
   2 From: Olivier Schonken <olivier.schonken@gmail.com>
   3 Date: Sat, 2 Mar 2013 18:01:03 +0200
   4 Subject: [PATCH] Changed Makefile.am to allow cross-compilation of HPLIP
   5
   6 Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
   7 ---
   8  Makefile.am |   28 ++++++++++++++--------------
   9  1 file changed, 14 insertions(+), 14 deletions(-)
  10
  11 diff --git a/Makefile.am b/Makefile.am
  12 index 16ea902..b22f46a 100644
  13 --- a/Makefile.am
  14 +++ b/Makefile.am
  15 @@ -72,7 +72,7 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/
  16           io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
  17           io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c
  18  else
  19 -libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
  20 +libhpmud_la_CFLAGS = -I$(includedir)/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
  21  libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
  22           io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
  23           io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c
  24 @@ -292,7 +292,7 @@ hpmudext_la_LIBADD = libhpmud.la
  25  if LIBUSB01_BUILD
  26  hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
  27  else
  28 -hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
  29 +hpmudext_la_CFLAGS =-I$(includedir)/libusb-1.0 -I$(PYTHONINCLUDEDIR)
  30  endif
  31
  32  # ui (qt3)
  33 @@ -564,26 +564,26 @@ endif
  34
  35  install-dist_hplip_LogDATA:
  36  if FULL_BUILD
  37 -       test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
  38 -       chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
  39 -       chmod 775 $(DESTDIR)$(hplip_Logdir)
  40 +#      test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
  41 +#      chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
  42 +#      chmod 775 $(DESTDIR)$(hplip_Logdir)
  43  endif  #FULL_BUILD
  44  if HPLIP_BUILD
  45 -       test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
  46 -       chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
  47 -       chmod 775 $(DESTDIR)$(hplip_Logdir)
  48 +#      test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
  49 +#      chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
  50 +#      chmod 775 $(DESTDIR)$(hplip_Logdir)
  51  endif  #FULL_BUILD
  52
  53  install-dist_hplip_tmpDATA:
  54  if FULL_BUILD
  55 -       test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
  56 -       chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
  57 -       chmod 1775 $(DESTDIR)$(hplip_tmpdir)
  58 +#      test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
  59 +#      chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
  60 +#      chmod 1775 $(DESTDIR)$(hplip_tmpdir)
  61  endif  #FULL_BUILD
  62  if HPLIP_BUILD
  63 -       test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
  64 -       chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
  65 -       chmod 1775 $(DESTDIR)$(hplip_tmpdir)
  66 +#      test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
  67 +#      chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
  68 +#      chmod 1775 $(DESTDIR)$(hplip_tmpdir)
  69  endif  #FULL_BUILD
  70
  71  install-dist_cronDATA:$(dist_cron_DATA)
  72 --
  73 1.7.10.4
  74