From: David Schleef <ds@schleef.org>
Date: Sat, 12 Jun 2004 20:56:06 +0000 (+0000)
Subject: distcheck fixes
X-Git-Tag: r0_7_22~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2541e7b171ca582321378408c0f1b5e582ca0bf2;p=comedilib.git

distcheck fixes
---

diff --git a/configure.ac b/configure.ac
index 3f0cb76..3fe4499 100644
--- 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 55a0a7a..cfcc1ce 100644
--- 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