patch-Makefile 3.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485
  1. --- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100
  2. +++ pcmciautils-017/Makefile 2010-07-30 17:34:46.000000000 +0200
  3. @@ -94,12 +94,13 @@ PWD = $(shell pwd)
  4. # If you are running a cross compiler, you may want to set this
  5. # to something more interesting, like "arm-linux-". If you want
  6. # to compile vs uClibc, that can be done here as well.
  7. -CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
  8. +CROSS ?= #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
  9. CC = $(CROSS)gcc
  10. LD = $(CROSS)gcc
  11. AR = $(CROSS)ar
  12. STRIP = $(CROSS)strip
  13. RANLIB = $(CROSS)ranlib
  14. +LEX = flex
  15. HOSTCC = gcc
  16. export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
  17. @@ -264,30 +265,31 @@ clean:
  18. install-hotplug:
  19. $(INSTALL) -d $(DESTDIR)$(hotplugdir)
  20. - $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
  21. - $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
  22. + $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent
  23. + $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc
  24. uninstall-hotplug:
  25. - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc
  26. install-socket-hotplug:
  27. - $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
  28. - $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
  29. + $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
  30. + $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
  31. uninstall-socket-hotplug:
  32. - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
  33. install-socket-tools:
  34. - $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
  35. + $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
  36. uninstall-socket-tools:
  37. - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP)
  38. install-tools:
  39. $(INSTALL) -d $(DESTDIR)$(sbindir)
  40. - $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
  41. + $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
  42. $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA)
  43. - $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS)
  44. + $(INSTALL) -d $(DESTDIR)$(udevhelperdir)
  45. + $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS)
  46. uninstall-tools:
  47. - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
  48. @@ -296,22 +298,24 @@ uninstall-tools:
  49. install-config:
  50. $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
  51. - $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
  52. + $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
  53. if [ -f config/config.opts.$(ARCH) ]; then \
  54. - $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \
  55. + $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \
  56. fi
  57. uninstall-config:
  58. # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts
  59. install-udev:
  60. - $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
  61. + $(INSTALL) -d $(DESTDIR)$(udevrulesdir)
  62. + $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
  63. uninstall-udev:
  64. - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules
  65. install-man:
  66. - $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
  67. + $(INSTALL) -d $(DESTDIR)$(mandir)/man8
  68. + $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8
  69. $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8
  70. uninstall-man: