Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Now using the right Ruby for Command T plugin

  • Loading branch information...
commit 4a0c7ce5781696ec139f972e104db352a0690b03 1 parent 442dc36
@duff duff authored
View
61 ruby/command-t/Makefile
@@ -4,59 +4,65 @@ SHELL = /bin/sh
#### Start of system configuration section. ####
srcdir = .
-topdir = /opt/ruby-enterprise-1.8.6-20090610/lib/ruby/1.8/i686-darwin10.0.0
+topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0
hdrdir = $(topdir)
VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/opt/ruby-enterprise-1.8.6-20090610
exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
+prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+sharedstatedir = $(prefix)/com
+mandir = $(DESTDIR)/usr/share/man
psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(DESTDIR)/Library/Ruby/Site
htmldir = $(docdir)
-datadir = $(datarootdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
includedir = $(prefix)/include
-infodir = $(datarootdir)/info
+infodir = $(DESTDIR)/usr/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
sysconfdir = $(prefix)/etc
-mandir = $(datarootdir)/man
libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
+datadir = $(datarootdir)
localstatedir = $(prefix)/var
sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
CC = gcc
-LIBRUBY = $(LIBRUBY_A)
+LIBRUBY = $(LIBRUBY_SO)
LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED =
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
RUBY_EXTCONF_H =
-CFLAGS = -fno-common -g -O2 -pipe -fno-common
+CFLAGS = -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common $(cflags)
INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
DEFS =
-CPPFLAGS = -DHAVE_RUBY_H $(DEFS)
+CPPFLAGS = -DHAVE_RUBY_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
CXXFLAGS = $(CFLAGS)
-DLDFLAGS = -L.
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+ldflags = -L. -arch i386 -arch x86_64
+dldflags =
+archflag =
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup
AR = ar
EXEEXT =
RUBY_INSTALL_NAME = ruby
RUBY_SO_NAME = ruby
-arch = i686-darwin10.0.0
-sitearch = i686-darwin10.0.0
+arch = universal-darwin10.0
+sitearch = universal-darwin10.0
ruby_version = 1.8
-ruby = /opt/ruby-enterprise-1.8.6-20090610/bin/ruby
+ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
RUBY = $(ruby)
RM = rm -f
MAKEDIRS = mkdir -p
@@ -80,7 +86,7 @@ extout =
extout_prefix =
target_prefix =
LOCAL_LIBS =
-LIBS = -ldl -lobjc
+LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl
SRCS = ext.c match.c matcher.c
OBJS = ext.o match.o matcher.o
TARGET = ext
@@ -88,6 +94,7 @@ DLLIB = $(TARGET).bundle
EXTSTATIC =
STATIC_LIB =
+BINDIR = $(bindir)
RUBYCOMMONDIR = $(sitedir)$(target_prefix)
RUBYLIBDIR = $(sitelibdir)$(target_prefix)
RUBYARCHDIR = $(sitearchdir)$(target_prefix)
View
BIN  ruby/command-t/ext.bundle
Binary file not shown
View
BIN  ruby/command-t/ext.o
Binary file not shown
View
BIN  ruby/command-t/match.o
Binary file not shown
View
BIN  ruby/command-t/matcher.o
Binary file not shown
View
2  ruby/command-t/mkmf.log
@@ -1,6 +1,6 @@
have_header: checking for ruby.h... -------------------- yes
-"gcc -E -I. -I/opt/ruby-enterprise-1.8.6-20090610/lib/ruby/1.8/i686-darwin10.0.0 -I. -g -O2 -pipe -fno-common conftest.c -o conftest.i"
+"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common conftest.c -o conftest.i"
checked program was:
/* begin */
1: #include <ruby.h>

0 comments on commit 4a0c7ce

Please sign in to comment.
Something went wrong with that request. Please try again.