rbcdio 0.01 → 0.02

data/ChangeLog

@@ -2,6 +2,83 @@
 ## autogenerated ChangeLog -- don't edit
 ##
 
+2007-10-27 Saturday 11:18  Rocky Bernstein <rocky@gnu.org>
+
+	* INSTALL, NEWS: Revise for 0.02 release.
+
+2007-10-14 Sunday 10:22  Rocky Bernstein <rocky@gnu.org>
+
+	* swig/: device.swg, rubycdio.swg: Update copyright.
+
+2007-10-14 Sunday 01:45  Rocky Bernstein <rocky@gnu.org>
+
+	* Makefile.am: Don't use :=, = is more portable.
+
+2007-10-13 Saturday 23:31  Rocky Bernstein <rocky@gnu.org>
+
+	* example/cdchange.rb: Remove require_gem update ChangeLog.
+
+2007-10-13 Saturday 23:25  Rocky Bernstein <rocky@gnu.org>
+
+	* example/: audio.rb, cd-read.rb, device.rb, drivers.rb, drives.rb,
+	  eject.rb, iso1.rb, iso2.rb, iso3.rb, tracks.rb: Remove
+	  require_gem statements.
+
+2007-10-13 Saturday 23:00  Rocky Bernstein <rocky@gnu.org>
+
+	* Makefile.am, NEWS, example/README, example/cdchange.rb,
+	  lib/cdio.rb, lib/iso9660.rb: reduce doc warning messages
+	  cdchange.rb: add example program from pycdio
+
+2007-10-13 Saturday 17:11  Rocky Bernstein <rocky@gnu.org>
+
+	* Makefile.am, README, configure.ac, ext/cdio/extconf.rb,
+	  ext/iso9660/extconf.rb: Mostly small changes Makefile.am: be
+	  explicit about requiring mkmf configure.ac: typo extconf.rb: get
+	  libs from pkg-config
+
+2007-10-13 Saturday 09:23  Rocky Bernstein <rocky@gnu.org>
+
+	* NEWS, configure.ac, test/cdiotest.rb, test/isotest.rb: test/*:
+	  reduce warnings by defining Mypath only once configure.ac, NEWS:
+	  get ready for 0.02 release
+
+2007-08-01 Wednesday 04:06  Rocky Bernstein <rocky@gnu.org>
+
+	* swig/rubyiso9660.swg: Memory allocation was off by one in the
+	  name_translate function. This could lead to a buffer overflow
+	  when the translated name is as long as the original.	Patch by
+	  Martin Ferrari on the Perl code.
+
+2007-06-19 Tuesday 11:32  Rocky Bernstein <rocky@gnu.org>
+
+	* README: Small grammar changes.
+
+2006-12-22 Friday 16:27  Rocky Bernstein <rocky@gnu.org>
+
+	* htdocs/index.html: Uncomment $Id: ChangeLog,v 1.7 2007/10/27 11:19:41 rocky Exp $ line.
+
+2006-12-22 Friday 16:27  Rocky Bernstein <rocky@gnu.org>
+
+	* README, htdocs/index.html: Doc changes.
+
+2006-12-21 Thursday 11:55  Rocky Bernstein <rocky@gnu.org>
+
+	* README, example/cd-read.rb, ext/cdio/extconf.rb,
+	  ext/iso9660/extconf.rb: README: note ginstall weirdness on
+	  Solaris ext/*/extconf.rb: Do add cygwin-specific libraries
+	  example/cd-read.rb: trailing blank was messing up ruby magic
+
+2006-12-16 Saturday 14:33  Rocky Bernstein <rocky@gnu.org>
+
+	* Rakefile: Add test/cdda.toc
+
+2006-12-16 Saturday 14:29  Rocky Bernstein <rocky@gnu.org>
+
+	* Rakefile, example/device.rb, example/drivers.rb,
+	  example/drives.rb: Rakefile: add Makefile.  example/*.rb: print
+	  an error message if no CD-ROM devices.
+
 2006-12-16 Saturday 13:24  Rocky Bernstein <rocky@gnu.org>
 
 	* README, example/audio.rb, example/cd-read.rb, example/eject.rb,

data/INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,21 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   If you downloaded the rbcdio gem package or have access to
+rubyforge.net "gem install rbcdio" may work.
+
+   Briefly, the shell commands `./configure; make; make test; make
+install' should configure, build, test and install this package.  On
+systems which don't install GNU Make by default you may have to use
+"gmake" instead of "make".
+
+   Alternatively to be more Ruby like, you can use "rake", "rake test"
+and "rake package" to build, and test and create a gem package. To
+install the gem, cd to pkg and "gem install rbcdio-*.gem."
+
+   On systems which don't install GNU Make by default you may have to
+use The following more-detailed instructions are generic; see the
+`README' file for instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +37,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +49,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -78,7 +89,7 @@ details on some of the pertinent environment variables.
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -87,17 +98,15 @@ Compiling For Multiple Architectures
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
@@ -190,12 +199,12 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================

data/Makefile.am

@@ -1,6 +1,6 @@
-#   $Id: Makefile.am,v 1.20 2006/12/09 16:00:02 rocky Exp $
+#   $Id: Makefile.am,v 1.23 2007/10/14 01:45:54 rocky Exp $
 #
-#    Copyright (C) 2006 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 ##   which configure then turns into a Makefile  ...
 ##     which make can then use to produce stuff. Isn't configuration simple? 
 
-SWIG := @SWIG@
-SWIG_FLAGS := @SWIG_FLAGS@
-SO   := @SO@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
+SO   = @SO@
 CDIO_EXTCONF = $(top_builddir)/ext/cdio/extconf.rb
 ISO_EXTCONF = $(top_builddir)/ext/iso9660/extconf.rb
 
@@ -59,6 +59,7 @@ DATA_FILES = data/copying.iso data/isofs-m1.cue data/isofs-m1.bin
 EXAMPLE_FILES = \
 	example/README     \
 	example/audio.rb   \
+	example/cdchange.rb   \
 	example/device.rb  \
 	example/drives.rb \
 	example/eject.rb   \
@@ -67,11 +68,11 @@ EXAMPLE_FILES = \
 	example/iso3.rb    \
 	example/tracks.rb
 
-CDIO_C   := $(top_builddir)/ext/cdio/rubycdio_wrap.c
-CDIO_OBJ := $(top_builddir)/ext/cdio/rubycdio_wrap.o
+CDIO_C   = $(top_builddir)/ext/cdio/rubycdio_wrap.c
+CDIO_OBJ = $(top_builddir)/ext/cdio/rubycdio_wrap.o
 
-ISO_C   := $(top_builddir)/ext/iso9660/rubyiso9660_wrap.c
-ISO_OBJ := $(top_builddir)/ext/iso9660/rubyiso9660_wrap.o
+ISO_C   = $(top_builddir)/ext/iso9660/rubyiso9660_wrap.c
+ISO_OBJ = $(top_builddir)/ext/iso9660/rubyiso9660_wrap.o
 
 RUBY = @RUBY@
 RUBYCDIO = ext/cdio/rubycdio$(SO)
@@ -102,10 +103,10 @@ $(CDIO_C): $(CDIO_SRC)
 	$(SWIG) -o $(CDIO_C) -outdir $(top_builddir) -ruby $(SWIG_FLAGS) $<
 
 $(RUBYCDIO): $(CDIO_C) $(CDIO_EXTCONF)
-	(cd ext/cdio && $(RUBY) extconf.rb && $(MAKE))
+	(cd ext/cdio && $(RUBY) -r mkmf extconf.rb && $(MAKE))
 
 $(RUBYISO9660): $(ISO_C) $(ISO_EXTCONF)
-	(cd ext/iso9660 && $(RUBY) extconf.rb && $(MAKE))
+	(cd ext/iso9660 && $(RUBY) -r mkmf extconf.rb && $(MAKE))
 
 $(ISO_C): $(ISO_SRC)
 	$(SWIG) -o $(ISO_C) -outdir $(top_builddir) -ruby $(SWIG_FLAGS) $<

data/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,9 +14,9 @@
 
 @SET_MAKE@
 
-#   $Id: Makefile.am,v 1.20 2006/12/09 16:00:02 rocky Exp $
+#   $Id: Makefile.am,v 1.23 2007/10/14 01:45:54 rocky Exp $
 #
-#    Copyright (C) 2006 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2006, 2007 Rocky Bernstein <rocky@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -33,15 +33,11 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #    02110-1301 USA.
 #
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,18 +51,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/VERSION.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 	THANKS config.guess config.sub install-sh missing
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/rubycdio.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = VERSION
 SOURCES =
@@ -83,8 +79,6 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -102,6 +96,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -113,9 +108,8 @@ LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -131,16 +125,16 @@ RUBY_INC = @RUBY_INC@
 RUBY_LIBS = @RUBY_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SO := @SO@
+SO = @SO@
 STRIP = @STRIP@
-SWIG := @SWIG@
-SWIG_FLAGS := @SWIG_FLAGS@
+SWIG = @SWIG@
+SWIG_FLAGS = @SWIG_FLAGS@
 VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -152,13 +146,18 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -168,16 +167,22 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 libiso9660_CFLAGS = @libiso9660_CFLAGS@
 libiso9660_LIBS = @libiso9660_LIBS@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 CDIO_EXTCONF = $(top_builddir)/ext/cdio/extconf.rb
 ISO_EXTCONF = $(top_builddir)/ext/iso9660/extconf.rb
 
@@ -211,6 +216,7 @@ DATA_FILES = data/copying.iso data/isofs-m1.cue data/isofs-m1.bin
 EXAMPLE_FILES = \
 	example/README     \
 	example/audio.rb   \
+	example/cdchange.rb   \
 	example/device.rb  \
 	example/drives.rb \
 	example/eject.rb   \
@@ -219,10 +225,10 @@ EXAMPLE_FILES = \
 	example/iso3.rb    \
 	example/tracks.rb
 
-CDIO_C := $(top_builddir)/ext/cdio/rubycdio_wrap.c
-CDIO_OBJ := $(top_builddir)/ext/cdio/rubycdio_wrap.o
-ISO_C := $(top_builddir)/ext/iso9660/rubyiso9660_wrap.c
-ISO_OBJ := $(top_builddir)/ext/iso9660/rubyiso9660_wrap.o
+CDIO_C = $(top_builddir)/ext/cdio/rubycdio_wrap.c
+CDIO_OBJ = $(top_builddir)/ext/cdio/rubycdio_wrap.o
+ISO_C = $(top_builddir)/ext/iso9660/rubyiso9660_wrap.c
+ISO_OBJ = $(top_builddir)/ext/iso9660/rubyiso9660_wrap.o
 RUBYCDIO = ext/cdio/rubycdio$(SO)
 RUBYISO9660 = ext/iso9660/rubyiso9660$(SO)
 EXTRA_DIST = $(CDIO_SRC) $(CDIO_C) $(ISO_SRC) $(ISO_C) $(CDIO_EXTCONF) \
@@ -294,7 +300,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 VERSION: $(top_builddir)/config.status $(srcdir)/VERSION.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -304,24 +309,22 @@ CTAGS:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/$(top_builddir)/ext/cdio $(distdir)/$(top_builddir)/ext/iso9660 $(distdir)/$(top_srcdir)/swig $(distdir)/. $(distdir)/data $(distdir)/example $(distdir)/lib $(distdir)/test
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -335,7 +338,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -410,7 +413,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -477,12 +480,20 @@ info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -503,18 +514,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am am--refresh check check-am clean clean-generic dist \
 	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
 	distcheck distclean distclean-generic distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 
 .PHONY: test check ChangeLog doc rdoc, doc, rerdoc
@@ -533,10 +547,10 @@ $(CDIO_C): $(CDIO_SRC)
 	$(SWIG) -o $(CDIO_C) -outdir $(top_builddir) -ruby $(SWIG_FLAGS) $<
 
 $(RUBYCDIO): $(CDIO_C) $(CDIO_EXTCONF)
-	(cd ext/cdio && $(RUBY) extconf.rb && $(MAKE))
+	(cd ext/cdio && $(RUBY) -r mkmf extconf.rb && $(MAKE))
 
 $(RUBYISO9660): $(ISO_C) $(ISO_EXTCONF)
-	(cd ext/iso9660 && $(RUBY) extconf.rb && $(MAKE))
+	(cd ext/iso9660 && $(RUBY) -r mkmf extconf.rb && $(MAKE))
 
 $(ISO_C): $(ISO_SRC)
 	$(SWIG) -o $(ISO_C) -outdir $(top_builddir) -ruby $(SWIG_FLAGS) $<