Makefile in rbcdio-0.03

- old
+ new

@@ -2,66 +2,62 @@
 SHELL = /bin/sh
 
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /usr/lib/ruby/1.8/i586-linux
+topdir = /usr/lib/ruby/1.8/i486-linux
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 prefix = $(DESTDIR)/usr
-exec_prefix = $(DESTDIR)/usr
-sitedir = $(libdir)/ruby/site_ruby
+exec_prefix = $(prefix)
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
 rubylibdir = $(libdir)/ruby/$(ruby_version)
 docdir = $(datarootdir)/doc/$(PACKAGE)
 dvidir = $(docdir)
 datarootdir = $(prefix)/share
 archdir = $(rubylibdir)/$(arch)
-sbindir = $(DESTDIR)/usr/sbin
+sbindir = $(exec_prefix)/sbin
 psdir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
 localedir = $(datarootdir)/locale
 htmldir = $(docdir)
-datadir = $(DESTDIR)/usr/share
-includedir = $(DESTDIR)/usr/include
-infodir = $(DESTDIR)/usr/share/info
+datadir = $(datarootdir)
+includedir = $(prefix)/include
+infodir = $(prefix)/share/info
 sysconfdir = $(DESTDIR)/etc
-mandir = $(DESTDIR)/usr/share/man
-libdir = $(DESTDIR)/usr/lib
-sharedstatedir = $(DESTDIR)/usr/com
+mandir = $(prefix)/share/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(prefix)/com
 oldincludedir = $(DESTDIR)/usr/include
 pdfdir = $(docdir)
 sitearchdir = $(sitelibdir)/$(sitearch)
-vendorarchdir = $(vendorlibdir)/$(vendorarch)
-bindir = $(DESTDIR)/usr/bin
+bindir = $(exec_prefix)/bin
 localstatedir = $(DESTDIR)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
 sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(DESTDIR)/usr/lib
+libexecdir = $(prefix)/lib/ruby1.8
 
-CC = gcc
+CC = cc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L. -L$(libdir) -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -O2 -march=i586 -mtune=i686 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -g -g -fno-strict-aliasing  -fPIC 
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC 
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
 CPPFLAGS =  
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L.  -rdynamic -Wl,-export-dynamic  
+DLDFLAGS = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic  
 LDSHARED = $(CC) -shared
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i586-linux
-sitearch = i586-linux
-vendorarch = i586-linux
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = i486-linux
+sitearch = i486-linux
 ruby_version = 1.8
-ruby = /usr/bin/ruby
+ruby = /usr/bin/ruby1.8
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
@@ -71,20 +67,20 @@
 #### End of system configuration section. ####
 
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L'.' -L'$(libdir)' -Wl,-R'$(libdir)'
+LIBPATH =  -L"." -L"$(libdir)"
 DEFFILE = 
 
-CLEANFILES = 
+CLEANFILES = mkmf.log
 DISTCLEANFILES = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = -L/usr/local/lib -liso9660 -lcdio -lm  
-LIBS = $(LIBRUBYARG_SHARED)  -ldl -lcrypt -lm   -lc
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc
 SRCS = rubyiso9660_wrap.c
 OBJS = rubyiso9660_wrap.o
 TARGET = rubyiso9660
 DLLIB = $(TARGET).so
 EXTSTATIC = 