From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernd Haug Subject: Paths including spaces fail the installation: Patch Date: Wed, 13 Mar 2013 16:03:19 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:37699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFnDe-0003iT-VW for emacs-orgmode@gnu.org; Wed, 13 Mar 2013 11:04:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFnDT-0004MW-34 for emacs-orgmode@gnu.org; Wed, 13 Mar 2013 11:03:54 -0400 Received: from mail-bk0-x22c.google.com ([2a00:1450:4008:c01::22c]:33990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFnDS-0004MQ-Ll for emacs-orgmode@gnu.org; Wed, 13 Mar 2013 11:03:43 -0400 Received: by mail-bk0-f44.google.com with SMTP id j4so510261bkw.3 for ; Wed, 13 Mar 2013 08:03:41 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org I have encountered problems installing to paths including spaces. This is annoying for Aquamacs on OS X, where the normal installation location for a custom mode etc. is a directory in ~/Library/Application Support/Aquamacs Emacs. Minimal path quoting changes to the inferior Makefiles made the installation work. I have no location at hand from which I can offer public pulls at the moment, but if anybody wants to commit it for me, the patch follows in-line. Yours, Bernd diff --git a/doc/Makefile b/doc/Makefile index 234ab7e..ca5117e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -34,9 +34,9 @@ org-version.inc: org.texi @echo "@set DATE $(DATE)" >> org-version.inc install: org - if [ ! -d $(DESTDIR)$(infodir) ]; then $(MKDIR) $(DESTDIR)$(infodir); else true; fi ; - $(CP) org $(DESTDIR)$(infodir) - $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) org + if [ ! -d "$(DESTDIR)$(infodir)" ]; then $(MKDIR) "$(DESTDIR)$(infodir)"; else true; fi ; + $(CP) org "$(DESTDIR)$(infodir)" + $(INSTALL_INFO) --infodir="$(DESTDIR)$(infodir)" org clean: $(RM) org *.pdf *.html *_letter.tex org-version.inc \ @@ -47,7 +47,7 @@ cleanall: clean clean-install: $(RM) $(DESTDIR)$(infodir)/org* - $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) --remove org + $(INSTALL_INFO) --infodir="$(DESTDIR)$(infodir)" --remove org .SUFFIXES: .texi .tex .txt _letter.tex diff --git a/etc/Makefile b/etc/Makefile index 8b06158..317bd07 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -13,10 +13,10 @@ all: install: $(ETCDIRS) for dir in $? ; do \ - if [ ! -d $(DESTDIR)$(datadir)/$${dir} ] ; then \ - $(MKDIR) $(DESTDIR)$(datadir)/$${dir} ; \ + if [ ! -d "$(DESTDIR)$(datadir)"/$${dir} ] ; then \ + $(MKDIR) "$(DESTDIR)$(datadir)"/$${dir} ; \ fi ; \ - $(CP) $${dir}/* $(DESTDIR)$(datadir)/$${dir} ; \ + $(CP) $${dir}/* "$(DESTDIR)$(datadir)"/$${dir} ; \ done ; clean: @@ -25,7 +25,7 @@ cleanall: clean-install: $(ETCDIRS) for dir in $? ; do \ - if [ -d $(DESTDIR)$(datadir)/$${dir} ] ; then \ - $(RMR) $(DESTDIR)$(datadir)/$${dir} ; \ + if [ -d "$(DESTDIR)$(datadir)"/$${dir} ] ; then \ + $(RMR) "$(DESTDIR)$(datadir)"/$${dir} ; \ fi ; \ done ; diff --git a/lisp/Makefile b/lisp/Makefile index 0e10c23..70af48a 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -77,10 +77,10 @@ $(LISPI): $(LISPV) $(LISPF) @$(MAKE_ORG_INSTALL) install: compile $(LISPF) - if [ ! -d $(DESTDIR)$(lispdir) ] ; then \ - $(MKDIR) $(DESTDIR)$(lispdir) ; \ + if [ ! -d "$(DESTDIR)$(lispdir)" ] ; then \ + $(MKDIR) "$(DESTDIR)$(lispdir)" ; \ fi ; - $(CP) $(LISPC) $(LISPF) $(LISPA) $(DESTDIR)$(lispdir) + $(CP) $(LISPC) $(LISPF) $(LISPA) "$(DESTDIR)$(lispdir)" cleanauto clean cleanall:: $(RM) $(LISPA) $(LISPB) @@ -88,6 +88,6 @@ clean cleanall cleanelc:: $(RM) *.elc clean-install: - if [ -d $(DESTDIR)$(lispdir) ] ; then \ - $(RM) $(DESTDIR)$(lispdir)/org*.el* $(DESTDIR)$(lispdir)/ob*.el* ; \ + if [ -d "$(DESTDIR)$(lispdir)" ] ; then \ + $(RM) "$(DESTDIR)$(lispdir)"/org*.el* "$(DESTDIR)$(lispdir)"/ob*.el* ; \ fi ; -- Senior Software Engineer Xaidat GmbH Wickenburggasse 5 8010 Graz Austria / Europe web: http://www.xaidat.com/ phone: +43-676-845023-706 email: bernd.haug@xaidat.com FN 384295s, LG ZRS Graz UID-Nr. ATU67414611