command-t 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3fc62a23bf7b551669e54df491df3d955b9dfbc
-  data.tar.gz: 73fe14c5464d0f9ec9d6683213e677f590158696
+  metadata.gz: c55e2ba2d749e3863e2f3a2d2d1d609c5425d4b4
+  data.tar.gz: 6320c53cbf425cd71a877f17b70e6e038c5772b4
 SHA512:
-  metadata.gz: 400b58429a528348f88392a42c3effa7f90cd11db22e0559f442139d3776a54664a71766edc33fac5f27dc869e77950baa943873aad2ab1d3905f6a7d8aa6c08
-  data.tar.gz: 02b9a4a5ea7d6633ca3ef38adbc5af87a8dae0eeda3dfc828b69af4c6ccb2dcac9e64dc1363f6be8197cb52342cd9b345bdb82887e00373d7bbdc2cded408d69
+  metadata.gz: df4c6b4065a0c165b0a62542a4e9fa27d5c4752fd5fc8be2557d43158aba160c1df14040d7f027f9327bf4d16ee6c22e090f76f4eb1716398d7e7970d1d39940
+  data.tar.gz: c6cdb4305a1f306a8f018773c1979cb9512e0fb4e33941658eb93f50151a3ed5d69707f09753e00de25e91ac57e5f6cd109e9927fc3c6427577cf2ab44b512cd

data/README.txt

@@ -11,13 +11,14 @@ CONTENTS                                        *command-t-contents*
  6. Commands                |command-t-commands|
  7. Mappings                |command-t-mappings|
  8. Options                 |command-t-options|
- 9. Tips                    |command-t-tips|
-10. Authors                 |command-t-authors|
-11. Development             |command-t-development|
-12. Website                 |command-t-website|
-13. Donations               |command-t-donations|
-14. License                 |command-t-license|
-15. History                 |command-t-history|
+ 9. FAQ                     |command-t-faq|
+10. Tips                    |command-t-tips|
+11. Authors                 |command-t-authors|
+12. Development             |command-t-development|
+13. Website                 |command-t-website|
+14. Donations               |command-t-donations|
+15. License                 |command-t-license|
+16. History                 |command-t-history|
 
 
 INTRODUCTION                                    *command-t-intro*
@@ -70,7 +71,7 @@ If your Vim lacks support you'll see an error message like this:
   E319: Sorry, the command is not available in this version
 
 The version of Vim distributed with OS X may not include Ruby support (for
-exmaple, Snow Leopard, which was the current version of OS X when Command-T
+example, Snow Leopard, which was the current version of OS X when Command-T
 was first released, did not support Ruby in the system Vim, but the current
 version of OS X at the time of writing, Mavericks, does). All recent versions
 of MacVim come with Ruby support; it is available from:
@@ -87,7 +88,7 @@ Ruby 1.9, but apparently has some bugs that need to be resolved).
 In addition to having Ruby support in Vim, your system itself must have a
 compatible Ruby install. "Compatible" means the same version as Vim itself
 links against. If you use a different version then Command-T is unlikely
-to work (see TROUBLE-SHOOTING below).
+to work (see |command-t-trouble-shooting| below).
 
 On OS X Snow Leopard, Lion and Mountain Lion, the system comes with Ruby 1.8.7
 and all recent versions of MacVim (the 7.2 snapshots and 7.3) are linked
@@ -103,7 +104,7 @@ your distribution. You can usually find this out by examining the
 compilation and linking flags displayed by the |:version| command in Vim, and
 by looking at the output of:
 
-  :ruby puts RUBY_VERSION
+  :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
 A suitable Ruby environment for Windows can be installed using the Ruby
 1.8.7-p299 RubyInstaller available at:
@@ -702,6 +703,46 @@ settings can be used to control behavior:
       only during Command-T searches.
 
 
+FAQ                                             *command-t-faq*
+
+Why does my build fail with "unknown argument -multiply_definedsuppress"? ~
+
+You may see this on OS X Mavericks when building with the Clang compiler
+against the system Ruby. This is an unfortunate Apple bug that breaks
+compilation of many Ruby gems with native extensions on Mavericks. It has been
+worked around in the upstream Ruby version, but won't be fixed in OS X until
+Apple updates their supplied version of Ruby (most likely this won't be until
+the next major release):
+
+  https://bugs.ruby-lang.org/issues/9624
+
+Workarounds include building your own Ruby (and then your own Vim and
+Command-T), or more simply, building with the following `ARCHFLAGS` set:
+
+  ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future ruby extconf.rb
+  make
+
+Why can't I open in a split with <C-CR> and <C-s> in the terminal? ~
+
+It's likely that <C-CR> won't work in most terminals, because the keycode that
+is sent to processes running inside them is identical to <CR>; when you type
+<C-CR>, terminal Vim literally "sees" <CR>. Unfortunately, there is no
+workaround for this.
+
+If you find that <C-s> also doesn't work the most likely explanation is that
+XON/XOFF flow control is enabled; this is the default in many environments.
+This means that when you press <C-s> all input to the terminal is suspended
+until you release it by hitting <C-q>. While input is suspended you may think
+your terminal has frozen, but it hasn't.
+
+To disable flow control, add the following to your `.zshrc` or
+`.bash_profile`:
+
+  stty -ixon
+
+See the `stty` man page for more details.
+
+
 TIPS                                            *command-t-tips*
 
 Working with very large repositories ~
@@ -744,8 +785,9 @@ Wait for 200ms of keyboard inactivity before computing search results. For
 example, if you are enter "foobar" quickly (ie. within 1 second), there is
 little sense in fetching the results for "f", "fo", "foo", "foob", "fooba" and
 finally "foobar". Instead, we can just fetch the results for "foobar". This
-setting trades off some immediate responsiveness at the micro level for a
-better search experience overall.
+setting trades off some immediate responsiveness at the micro level for
+better performance (real and perceived) and a better search experience
+overall.
 
     let g:CommandTFileScanner = 'watchman'
 
@@ -759,7 +801,7 @@ repos the "watchman" scanner is the tool of choice.
 
 This scanner delegates the task of finding files to Facebook's `watchman` tool
 (https://github.com/facebook/watchman), which can return results for a 500,000
-file hierarchy within about 10 seconds.
+file hierarchy within about a second.
 
 Note that Watchman has a range of configuration options that can be applied by
 files such as `/etc/watchman.json` or per-direcory `.watchmanconfig` files and
@@ -779,7 +821,7 @@ It's advisable to keep a long-running Vim instance in place and let it cache
 the directory listings rather than repeatedly closing and re-opening Vim in
 order to edit every file. On those occasions when you do need to flush the
 cache (ie. with |CommandTFlush| or <C-f> in the match listing window), use of
-the Watchman scanner should make the delay tolerable.
+the Watchman scanner should make the delay barely noticeable.
 
 As noted in the introduction, Command-T works best when you adopt a
 "path-centric" mentality. This is especially true on very large hierarchies.
@@ -795,9 +837,17 @@ who know what they want to open and where it is to open it as quickly as
 possible; other tools such as NERDTree exist for visually exploring an unknown
 hierarchy.
 
+Over time, you will get a feel for how economical you can afford to be with
+your search queries in a given repo. In the example above, if "foo" is not a
+very common pattern in your hierarchy, then you may find that you can find
+what you need with a very concise query such as "foomanjs". With time, this
+kind of ongoing calibration will come quite naturally.
+
 Finally, it is important to be on a relatively recent version of Command-T to
 fully benefit from the available performance enhancements:
 
+- version 1.8 (March 2013) sped up the Watchman file scanner by switching its
+  communication from the JSON to the binary Watchman protocol
 - version 1.7 (February 2014) added the |g:CommandTInputDebounce| and
   |g:CommandTFileScanner| settings, along with support for the Watchman file
   scanner
@@ -821,13 +871,13 @@ order):
   Ivan Ukhov              Paul Jolly              Vít Ondruch
   Jeff Kreeftmeijer       Pavel Sergeev           Woody Peterson
   Lucas de Vries          Rainux Luo              Yan Pritzker
-  Marcus Brito            Scott Bronson           Yiding Jia
-  Marian Schubert         Seth Fowler             Zak Johnson
-  Matthew Todd
+  Marcus Brito            Roland Puntaier         Yiding Jia
+  Marian Schubert         Scott Bronson           Zak Johnson
+  Matthew Todd            Seth Fowler
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
-is one of the largest Ruby-based Vim plug-ins to date.
+was one of the largest Ruby-based Vim plug-ins at the time.
 
 While the Command-T codebase doesn't contain any code directly copied from
 LustyExplorer, I did use it as a reference for answers to basic questions (like
@@ -926,6 +976,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.8 (31 March 2014)
+
+- taught Watchman file scanner to use the binary protocol instead of JSON,
+  roughly doubling its speed
+- build changes to accommodate MinGW (patch from Roland Puntaier)
+
 1.7 (9 March 2014)
 
 - added |g:CommandTInputDebounce|, which can be used to improve responsiveness

data/doc/command-t.txt

@@ -11,13 +11,14 @@ CONTENTS                                        *command-t-contents*
  6. Commands                |command-t-commands|
  7. Mappings                |command-t-mappings|
  8. Options                 |command-t-options|
- 9. Tips                    |command-t-tips|
-10. Authors                 |command-t-authors|
-11. Development             |command-t-development|
-12. Website                 |command-t-website|
-13. Donations               |command-t-donations|
-14. License                 |command-t-license|
-15. History                 |command-t-history|
+ 9. FAQ                     |command-t-faq|
+10. Tips                    |command-t-tips|
+11. Authors                 |command-t-authors|
+12. Development             |command-t-development|
+13. Website                 |command-t-website|
+14. Donations               |command-t-donations|
+15. License                 |command-t-license|
+16. History                 |command-t-history|
 
 
 INTRODUCTION                                    *command-t-intro*
@@ -70,7 +71,7 @@ If your Vim lacks support you'll see an error message like this:
   E319: Sorry, the command is not available in this version
 
 The version of Vim distributed with OS X may not include Ruby support (for
-exmaple, Snow Leopard, which was the current version of OS X when Command-T
+example, Snow Leopard, which was the current version of OS X when Command-T
 was first released, did not support Ruby in the system Vim, but the current
 version of OS X at the time of writing, Mavericks, does). All recent versions
 of MacVim come with Ruby support; it is available from:
@@ -87,7 +88,7 @@ Ruby 1.9, but apparently has some bugs that need to be resolved).
 In addition to having Ruby support in Vim, your system itself must have a
 compatible Ruby install. "Compatible" means the same version as Vim itself
 links against. If you use a different version then Command-T is unlikely
-to work (see TROUBLE-SHOOTING below).
+to work (see |command-t-trouble-shooting| below).
 
 On OS X Snow Leopard, Lion and Mountain Lion, the system comes with Ruby 1.8.7
 and all recent versions of MacVim (the 7.2 snapshots and 7.3) are linked
@@ -103,7 +104,7 @@ your distribution. You can usually find this out by examining the
 compilation and linking flags displayed by the |:version| command in Vim, and
 by looking at the output of:
 
-  :ruby puts RUBY_VERSION
+  :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
 A suitable Ruby environment for Windows can be installed using the Ruby
 1.8.7-p299 RubyInstaller available at:
@@ -702,6 +703,46 @@ settings can be used to control behavior:
       only during Command-T searches.
 
 
+FAQ                                             *command-t-faq*
+
+Why does my build fail with "unknown argument -multiply_definedsuppress"? ~
+
+You may see this on OS X Mavericks when building with the Clang compiler
+against the system Ruby. This is an unfortunate Apple bug that breaks
+compilation of many Ruby gems with native extensions on Mavericks. It has been
+worked around in the upstream Ruby version, but won't be fixed in OS X until
+Apple updates their supplied version of Ruby (most likely this won't be until
+the next major release):
+
+  https://bugs.ruby-lang.org/issues/9624
+
+Workarounds include building your own Ruby (and then your own Vim and
+Command-T), or more simply, building with the following `ARCHFLAGS` set:
+
+  ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future ruby extconf.rb
+  make
+
+Why can't I open in a split with <C-CR> and <C-s> in the terminal? ~
+
+It's likely that <C-CR> won't work in most terminals, because the keycode that
+is sent to processes running inside them is identical to <CR>; when you type
+<C-CR>, terminal Vim literally "sees" <CR>. Unfortunately, there is no
+workaround for this.
+
+If you find that <C-s> also doesn't work the most likely explanation is that
+XON/XOFF flow control is enabled; this is the default in many environments.
+This means that when you press <C-s> all input to the terminal is suspended
+until you release it by hitting <C-q>. While input is suspended you may think
+your terminal has frozen, but it hasn't.
+
+To disable flow control, add the following to your `.zshrc` or
+`.bash_profile`:
+
+  stty -ixon
+
+See the `stty` man page for more details.
+
+
 TIPS                                            *command-t-tips*
 
 Working with very large repositories ~
@@ -744,8 +785,9 @@ Wait for 200ms of keyboard inactivity before computing search results. For
 example, if you are enter "foobar" quickly (ie. within 1 second), there is
 little sense in fetching the results for "f", "fo", "foo", "foob", "fooba" and
 finally "foobar". Instead, we can just fetch the results for "foobar". This
-setting trades off some immediate responsiveness at the micro level for a
-better search experience overall.
+setting trades off some immediate responsiveness at the micro level for
+better performance (real and perceived) and a better search experience
+overall.
 
     let g:CommandTFileScanner = 'watchman'
 
@@ -759,7 +801,7 @@ repos the "watchman" scanner is the tool of choice.
 
 This scanner delegates the task of finding files to Facebook's `watchman` tool
 (https://github.com/facebook/watchman), which can return results for a 500,000
-file hierarchy within about 10 seconds.
+file hierarchy within about a second.
 
 Note that Watchman has a range of configuration options that can be applied by
 files such as `/etc/watchman.json` or per-direcory `.watchmanconfig` files and
@@ -779,7 +821,7 @@ It's advisable to keep a long-running Vim instance in place and let it cache
 the directory listings rather than repeatedly closing and re-opening Vim in
 order to edit every file. On those occasions when you do need to flush the
 cache (ie. with |CommandTFlush| or <C-f> in the match listing window), use of
-the Watchman scanner should make the delay tolerable.
+the Watchman scanner should make the delay barely noticeable.
 
 As noted in the introduction, Command-T works best when you adopt a
 "path-centric" mentality. This is especially true on very large hierarchies.
@@ -795,9 +837,17 @@ who know what they want to open and where it is to open it as quickly as
 possible; other tools such as NERDTree exist for visually exploring an unknown
 hierarchy.
 
+Over time, you will get a feel for how economical you can afford to be with
+your search queries in a given repo. In the example above, if "foo" is not a
+very common pattern in your hierarchy, then you may find that you can find
+what you need with a very concise query such as "foomanjs". With time, this
+kind of ongoing calibration will come quite naturally.
+
 Finally, it is important to be on a relatively recent version of Command-T to
 fully benefit from the available performance enhancements:
 
+- version 1.8 (March 2013) sped up the Watchman file scanner by switching its
+  communication from the JSON to the binary Watchman protocol
 - version 1.7 (February 2014) added the |g:CommandTInputDebounce| and
   |g:CommandTFileScanner| settings, along with support for the Watchman file
   scanner
@@ -821,13 +871,13 @@ order):
   Ivan Ukhov              Paul Jolly              Vít Ondruch
   Jeff Kreeftmeijer       Pavel Sergeev           Woody Peterson
   Lucas de Vries          Rainux Luo              Yan Pritzker
-  Marcus Brito            Scott Bronson           Yiding Jia
-  Marian Schubert         Seth Fowler             Zak Johnson
-  Matthew Todd
+  Marcus Brito            Roland Puntaier         Yiding Jia
+  Marian Schubert         Scott Bronson           Zak Johnson
+  Matthew Todd            Seth Fowler
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
-is one of the largest Ruby-based Vim plug-ins to date.
+was one of the largest Ruby-based Vim plug-ins at the time.
 
 While the Command-T codebase doesn't contain any code directly copied from
 LustyExplorer, I did use it as a reference for answers to basic questions (like
@@ -926,6 +976,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.8 (31 March 2014)
+
+- taught Watchman file scanner to use the binary protocol instead of JSON,
+  roughly doubling its speed
+- build changes to accommodate MinGW (patch from Roland Puntaier)
+
 1.7 (9 March 2014)
 
 - added |g:CommandTInputDebounce|, which can be used to improve responsiveness

data/doc/tags

@@ -9,6 +9,7 @@ command-t-commands	command-t.txt	/*command-t-commands*
 command-t-contents	command-t.txt	/*command-t-contents*
 command-t-development	command-t.txt	/*command-t-development*
 command-t-donations	command-t.txt	/*command-t-donations*
+command-t-faq	command-t.txt	/*command-t-faq*
 command-t-history	command-t.txt	/*command-t-history*
 command-t-installation	command-t.txt	/*command-t-installation*
 command-t-intro	command-t.txt	/*command-t-intro*

data/ruby/command-t/Makefile

@@ -11,12 +11,12 @@ ECHO = $(ECHO1:0=@echo)
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/glh/.rbenv/versions/2.1.1/include/ruby-2.1.0
+topdir = /Users/glh/.rbenv/versions/2.0.0-p247/include/ruby-2.0.0
 hdrdir = $(topdir)
-arch_hdrdir = /Users/glh/.rbenv/versions/2.1.1/include/ruby-2.1.0/x86_64-darwin13.0
+arch_hdrdir = /Users/glh/.rbenv/versions/2.0.0-p247/include/ruby-2.0.0/x86_64-darwin13.1.0
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/Users/glh/.rbenv/versions/2.1.1
+prefix = /Users/glh/.rbenv/versions/2.0.0-p247
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -49,7 +49,7 @@ dvidir = $(docdir)
 htmldir = $(docdir)
 infodir = $(datarootdir)/info
 docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
+oldincludedir = /usr/include
 includedir = $(prefix)/include
 localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
@@ -67,7 +67,7 @@ CXX = g++
 LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework CoreFoundation
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 empty =
 OUTFLAG = -o $(empty)
 COUTFLAG = -o $(empty)
@@ -76,14 +76,14 @@ RUBY_EXTCONF_H =
 cflags   =  $(optflags) $(debugflags) $(warnflags)
 optflags = -O3 -fno-fast-math
 debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wextra-tokens
+warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
 CCDLFLAGS = -fno-common
 CFLAGS   = $(CCDLFLAGS)  -O3 -Wno-error=shorten-64-to-32  -pipe $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -I/Users/glh/.rbenv/versions/2.1.1/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
+DEFS     =  -DWATCHMAN_BUILD
+CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -I/Users/glh/.rbenv/versions/2.0.0-p247/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
 CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
-ldflags  = -L. -L/Users/glh/.rbenv/versions/2.1.1/lib  -fstack-protector
+ldflags  = -L. -L/Users/glh/.rbenv/versions/2.0.0-p247/lib 
 dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
@@ -99,12 +99,12 @@ RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
 RUBY_BASE_NAME = ruby
 
-arch = x86_64-darwin13.0
+arch = x86_64-darwin13.1.0
 sitearch = $(arch)
-ruby_version = 2.1.0
+ruby_version = 2.0.0
 ruby = $(bindir)/ruby
 RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h
+ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
 
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
@@ -132,11 +132,11 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS =   -lpthread -ldl -lobjc 
-ORIG_SRCS = ext.c match.c matcher.c
+LIBS =  -lpthread  -lpthread -ldl -lobjc 
+ORIG_SRCS = ext.c match.c matcher.c watchman.c
 SRCS = $(ORIG_SRCS) 
-OBJS = ext.o match.o matcher.o
-HDRS = $(srcdir)/ext.h $(srcdir)/match.h $(srcdir)/matcher.h $(srcdir)/ruby_compat.h
+OBJS = ext.o match.o matcher.o watchman.o
+HDRS = $(srcdir)/ext.h $(srcdir)/match.h $(srcdir)/matcher.h $(srcdir)/ruby_compat.h $(srcdir)/watchman.h
 TARGET = ext
 TARGET_NAME = ext
 TARGET_ENTRY = Init_$(TARGET_NAME)
@@ -144,13 +144,12 @@ DLLIB = $(TARGET).bundle
 EXTSTATIC = 
 STATIC_LIB = 
 
-TIMESTAMP_DIR = .
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+BINDIR        = $(DESTDIR)$(bindir)
+RUBYCOMMONDIR = $(DESTDIR)$(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(DESTDIR)$(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(DESTDIR)$(sitearchdir)$(target_prefix)
+HDRDIR        = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
 CLEANLIBS     = $(TARGET).bundle 
@@ -180,7 +179,7 @@ distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
 realclean: distclean
 install: install-so install-rb
 
-install-so: $(DLLIB) $(TIMESTAMP_DIR)/.RUBYARCHDIR.time
+install-so: $(DLLIB) ./.RUBYARCHDIR.time
 	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 clean-static::
 	-$(Q)$(RM) $(STATIC_LIB)
@@ -190,8 +189,8 @@ pre-install-rb: Makefile
 pre-install-rb-default: Makefile
 pre-install-rb-default:
 	$(ECHO) installing default ext libraries
-$(TIMESTAMP_DIR)/.RUBYARCHDIR.time:
-	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
+./.RUBYARCHDIR.time:
+	$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
 	$(Q) $(TOUCH) $@
 
 site-install: site-install-so site-install-rb
@@ -232,12 +231,12 @@ $(DLLIB): $(OBJS) Makefile
 	$(ECHO) linking shared-object $(DLLIB)
 	-$(Q)$(RM) $(@)
 	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-	$(Q) $(POSTLINK)
+	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
 
 
 
 ###
-# Copyright 2010 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2014 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -260,4 +259,4 @@ $(DLLIB): $(OBJS) Makefile
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-CFLAGS += -std=c99 -Wall -Wextra -Wno-unused-parameter
+CFLAGS += -Wall -Wextra -Wno-unused-parameter