1Upstream-Status: Inappropriate [configuration] 2 3Hardcoded paths are bad... 4This lets us use the install from OE's native sysroot 5rebase the patch to 018, removing hardcoded path for true 6as well. Removing of -D in install invocation is a little 7questionable, is it some GNU extention? 8 9-Khem Raj <raj.khem@gmail.com> 10 11Index: pcmciautils-018/Makefile 12=================================================================== 13--- pcmciautils-018.orig/Makefile 14+++ pcmciautils-018/Makefile 15@@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin 16 mandir = ${prefix}/usr/share/man 17 udevdir = ${prefix}/lib/udev 18 19-INSTALL = /usr/bin/install -c 20+INSTALL = install -c 21 INSTALL_PROGRAM = ${INSTALL} 22 INSTALL_DATA = ${INSTALL} -m 644 23 INSTALL_SCRIPT = ${INSTALL_PROGRAM} 24@@ -180,7 +180,7 @@ endif 25 # if DEBUG is enabled, then we do not strip or optimize 26 ifeq ($(strip $(DEBUG)),true) 27 CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE 28- STRIPCMD = /bin/true -Since_we_are_debugging 29+ STRIPCMD = true -Since_we_are_debugging 30 else 31 CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE 32 STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment 33@@ -273,30 +273,32 @@ clean: 34 35 install-hotplug: 36 $(INSTALL) -d $(DESTDIR)$(hotplugdir) 37- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent 38- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc 39+ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent 40+ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc 41 42 uninstall-hotplug: 43 - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc 44 45 install-socket-hotplug: 46- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent 47- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc 48+ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent 49+ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc 50 51 uninstall-socket-hotplug: 52 - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc 53 54 install-socket-tools: 55- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) 56+ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) 57+ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) 58 59 uninstall-socket-tools: 60 - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) 61 62 install-tools: 63 $(INSTALL) -d $(DESTDIR)$(sbindir) 64- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) 65+ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) 66+ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) 67 $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) 68- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) 69+ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) 70 71 uninstall-tools: 72 - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) 73@@ -305,22 +307,24 @@ uninstall-tools: 74 75 install-config: 76 $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) 77- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts 78+ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts 79 if [ -f config/config.opts.$(ARCH) ]; then \ 80- $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ 81+ $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ 82 fi 83 84 uninstall-config: 85 # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts 86 87 install-udev: 88- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules 89+ $(INSTALL) -d $(DESTDIR)$(udevrulesdir) 90+ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules 91 92 uninstall-udev: 93 - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules 94 95 install-man: 96- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 97+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 98+ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 99 $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 100 101 uninstall-man: 102