[Pcsclite-git-commit] [CCID] 01/01: Makefile: add support of spaces in DESTDIR

Ludovic Rousseau rousseau at moszumanska.debian.org
Mon Oct 2 15:36:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository CCID.

commit ebe042a757dc85e2ecc9609edc3b4ced588c6eba
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Mon Oct 2 15:35:02 2017 +0200

    Makefile: add support of spaces in DESTDIR
    
    It is now possible to use space characters in the destination directory
    name (DESTDIR).
    
    This is inspired by Apple patch destDirFix.patch
    https://opensource.apple.com/source/SmartcardCCID/SmartcardCCID-55017/ccid/files/destDirFix.patch.auto.html
---
 src/Makefile.am | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 07f1e24..99f3567 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,25 +86,25 @@ Info.plist: Info.plist.src $(srcdir)/../readers/supported_readers.txt
 DISTCLEANFILES = tokenparser.c Info.plist
 
 install_ccid: libccid.la Info.plist
-	$(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
-	cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/
-	cp .libs/$(CCID_LIB) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)
+	$(mkinstalldirs) "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/"
+	cp Info.plist "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/"
+	cp .libs/$(CCID_LIB) "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)"
 	$(INSTALL_UDEV_RULE_FILE)
 
 install_ccidtwin: libccidtwin.la
-	$(mkinstalldirs) $(DESTDIR)$(ccidtwindir)
-	cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
-	$(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \
-		perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin
+	$(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)"
+	cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
+	$(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \
+		perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin"
 
 # do not uninstall the serial driver by default
 # use explicitely 'make uninstall_ccidtwin'
 uninstall: $(LIBS_TO_UNINSTALL)
 
 uninstall_ccid:
-	rm -rf $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)
+	rm -rf "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)"
 
 uninstall_ccidtwin:
-	rm -f $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
-	rm -f $(DESTDIR)/$(serialconfdir)/libccidtwin
+	rm -f "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
+	rm -f "$(DESTDIR)/$(serialconfdir)/libccidtwin"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/CCID.git



More information about the Pcsclite-cvs-commit mailing list