distcheck fixes

diff --git a/configure.ac b/configure.ac
index 3f0cb76a40dae42aed9a87d6712489b76ba0bb6c..3fe449996c11403a98ec81d8c8a6bddd51ae195e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,12 +92,12 @@ AC_SUBST(pcmciadir)
 
 #see: http://linux-hotplug.sourceforge.net/
 #the hotplug expects the device dependent scripts here:
-usbhotplugdir="/etc/hotplug/usb"
+usbhotplugdir="\${sysconfdir}/hotplug/usb"
 AC_SUBST(usbhotplugdir)
 
 #firmware for the hotplug script
 #see: http://linux-hotplug.sourceforge.net/
-usbfirmwaredir="/usr/share/usb"
+usbfirmwaredir="\${datadir}/usb"
 AC_SUBST(usbfirmwaredir)
 
 AC_CONFIG_FILES(

diff --git a/swig/ruby/Makefile.am b/swig/ruby/Makefile.am
index 55a0a7a953a85bf08b3d5253baa9d5846c090f61..cfcc1cef83871805034d52eb1514766523650eea 100644 (file)
--- a/swig/ruby/Makefile.am
+++ b/swig/ruby/Makefile.am
@@ -1,13 +1,16 @@
 
-EXTRA_DIST = demo ext lib
+EXTRA_DIST = demo lib
 
-BUILT_SOURCES = ext/comedi_ruby_wrap.c
+#BUILT_SOURCES = ext/comedi_ruby_wrap.c
 
 if HAVE_SWIG
-ext/comedi_ruby_wrap.c: ../comedi.i
-       $(SWIG) -ruby -o ./ext/comedi_ruby_wrap.c ../comedi.i
+ext/comedi_ruby_wrap.c: $(srcdir)/../comedi.i
+       mkdir -p ext
+       cp $(srcdir)/../comedi.i ext/comedi.i
+       $(SWIG) -ruby -o ext/comedi_ruby_wrap.c ext/comedi.i
 else
 ext/comedi_ruby_wrap.c:
+       mkdir -p ext
        echo WARNING: creating bogus comedi_ruby_wrap.c because you don\'t have swig.
        touch ext/comedi_ruby_wrap.c
 endif