Paths including spaces fail the installation: Patch

emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Bernd Haug <bernd.haug@xaidat.com>
To: emacs-orgmode@gnu.org
Subject: Paths including spaces fail the installation: Patch
Date: Wed, 13 Mar 2013 16:03:19 +0100	[thread overview]
Message-ID: <CAKjxQA3_PEaV-F8qqpSHEZGUOgat1UPrgMqRkbBPvLKGeRTN2Q@mail.gmail.com> (raw)

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

next             reply	other threads:[~2013-03-13 15:04 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-13 15:03 Bernd Haug [this message]
2013-03-13 16:05 ` Paths including spaces fail the installation: Patch Bastien
2013-03-13 18:10 ` Achim Gratz
2013-03-14  6:49   ` Achim Gratz
2013-04-22 13:33     ` Bernd Haug
2013-04-22 15:47       ` Achim Gratz
2013-04-23  6:22         ` Bernd Haug
2013-04-23 16:56           ` Achim Gratz
2013-04-25 10:24             ` Bernd Haug

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:234ab7e dfblob:8b06158 dfblob:0e10c23 dfblob:ca5117e
dfblob:317bd07 dfblob:70af48a
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAKjxQA3_PEaV-F8qqpSHEZGUOgat1UPrgMqRkbBPvLKGeRTN2Q@mail.gmail.com \
    --to=bernd.haug@xaidat.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).