aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-10-21 00:26:15 -0500
committerJack Nagel2014-10-21 00:26:15 -0500
commit039acd183d72537e006189a39cca93cbbd480ae7 (patch)
treedb4ac8fc3a009dc71d7f4ddf1abe6153e45eabe8 /Library
parentdb5031c43b428a28996ad2cc3acb18d3cbb992e1 (diff)
downloadhomebrew-039acd183d72537e006189a39cca93cbbd480ae7.tar.bz2
emacs: simplify ctags option
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/emacs.rb20
1 files changed, 6 insertions, 14 deletions
diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index f5374f070..11bec559e 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -50,15 +50,6 @@ class Emacs < Formula
cause "Duplicate symbol errors while linking."
end
- # Follow MacPorts and don't install ctags from Emacs. This allows Vim
- # and Emacs and ctags to play together without violence.
- def do_not_install_ctags
- unless build.include? "keep-ctags"
- (bin/"ctags").unlink
- (man1/"ctags.1.gz").unlink
- end
- end
-
def install
# HEAD builds blow up when built in parallel as of April 20 2012
ENV.deparallelize unless build.stable?
@@ -90,9 +81,6 @@ class Emacs < Formula
system "make", "install"
prefix.install "nextstep/Emacs.app"
- # Don't cause ctags clash.
- do_not_install_ctags
-
# Replace the symlink with one that avoids starting Cocoa.
(bin/"emacs").unlink # Kill the existing symlink
(bin/"emacs").write <<-EOS.undent
@@ -114,9 +102,13 @@ class Emacs < Formula
system "./configure", *args
system "make"
system "make", "install"
+ end
- # Don't cause ctags clash.
- do_not_install_ctags
+ # Follow MacPorts and don't install ctags from Emacs. This allows Vim
+ # and Emacs and ctags to play together without violence.
+ unless build.include? "keep-ctags"
+ (bin/"ctags").unlink
+ (man1/"ctags.1.gz").unlink
end
end