[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] Paths including spaces fail the installation: Patch
From: |
Bernd Haug |
Subject: |
[O] Paths including spaces fail the installation: Patch |
Date: |
Wed, 13 Mar 2013 16:03:19 +0100 |
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: address@hidden
FN 384295s, LG ZRS Graz
UID-Nr. ATU67414611
- [O] Paths including spaces fail the installation: Patch,
Bernd Haug <=