aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2014-12-03 15:45:23 -0500
committerSam Steingold2014-12-03 15:45:23 -0500
commit3f33f2210cae26d332141a6aeb9abb9e34f97fc7 (patch)
tree0f0f337e2391dbc44e010019cafcc39114793e1d
parentb3298507f92f8cc17dc35090e4036aac787af682 (diff)
downloademacs-3f33f2210cae26d332141a6aeb9abb9e34f97fc7.tar.gz
emacs-3f33f2210cae26d332141a6aeb9abb9e34f97fc7.zip
enable in-place GUI
* nextstep/Makefile.in (links): New phony target to create a fake installation pointing back to the source tree to run GUI Emacs in-place (http://article.gmane.org/gmane.emacs.devel:178330).
-rw-r--r--nextstep/ChangeLog6
-rw-r--r--nextstep/Makefile.in19
2 files changed, 22 insertions, 3 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 4bb84bcae4d..8b44d5c149c 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,9 @@
12014-12-03 Sam Steingold <sds@gnu.org>
2
3 * Makefile.in (links): New phony target to create a fake
4 installation pointing back to the source tree to run GUI Emacs
5 in-place (http://article.gmane.org/gmane.emacs.devel:178330).
6
12014-11-22 Glenn Morris <rgm@gnu.org> 72014-11-22 Glenn Morris <rgm@gnu.org>
2 8
3 * templates/Info-gnustep.plist.in: Let configure set URL. 9 * templates/Info-gnustep.plist.in: Let configure set URL.
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 52f321109b7..c07fe85ba8d 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -8,12 +8,12 @@
8## it under the terms of the GNU General Public License as published by 8## it under the terms of the GNU General Public License as published by
9## the Free Software Foundation, either version 3 of the License, or 9## the Free Software Foundation, either version 3 of the License, or
10## (at your option) any later version. 10## (at your option) any later version.
11## 11##
12## GNU Emacs is distributed in the hope that it will be useful, 12## GNU Emacs is distributed in the hope that it will be useful,
13## but WITHOUT ANY WARRANTY; without even the implied warranty of 13## but WITHOUT ANY WARRANTY; without even the implied warranty of
14## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15## GNU General Public License for more details. 15## GNU General Public License for more details.
16## 16##
17## You should have received a copy of the GNU General Public License 17## You should have received a copy of the GNU General Public License
18## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 18## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19 19
@@ -50,10 +50,23 @@ ${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} | \
50 ${ns_appbindir} 50 ${ns_appbindir}
51 cp -f ../src/emacs${EXEEXT} $@ 51 cp -f ../src/emacs${EXEEXT} $@
52 52
53.PHONY: all 53.PHONY: all links
54 54
55all: ${ns_appdir} ${ns_appbindir}/Emacs 55all: ${ns_appdir} ${ns_appbindir}/Emacs
56 56
57# create a fake installation pointing back to the source tree
58# to run GUI Emacs in-place
59links : ../src/emacs${EXEEXT} | ${ns_appbindir}
60 for d in $(shell cd ${srcdir}/${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done
61 for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(shell cd ${srcdir}; pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done
62 for d in $(shell cd ${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done
63 for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done
64 ln -s ../../../../../lisp ${ns_appdir}/Contents/Resources
65 ln -s ../../../../../etc ${ns_appdir}/Contents/Resources
66 ln -s ../../../../../info ${ns_appdir}/Contents/Resources
67 ln -s ../../../../src/emacs${EXEEXT} ${ns_appbindir}/Emacs
68 ln -s ../../../../lib-src ${ns_appbindir}/bin
69 ln -s ../../../../lib-src ${ns_appbindir}/libexec
57 70
58.PHONY: clean distclean bootstrap-clean maintainer-clean 71.PHONY: clean distclean bootstrap-clean maintainer-clean
59 72