added etc/ to EXTRA_DIST, moved creation of /etc/comedi/calibrations to

comedi_calibrate subdirectory's makefile

diff --git a/Makefile.am b/Makefile.am
index 0195e99b9436fcb33aa139c4145964b495d2d0b6..1fd28ab343f39e6f8a22593d502e4aa780808148 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,8 @@ SUBDIRS = lib comedi_calibrate comedi_config man testing demo doc python \
 #pkgconfigdir = $(libdir)/pkgconfig
 #pkgconfig_DATA = comedilib.pc
 
-EXTRA_DIST = include debian m4 comedilib.spec
+EXTRA_DIST = include debian m4 etc comedilib.spec 
 
 dist-hook:
        rm -rf `find $(distdir) -name CVS`
 
-install-data-local:
-       $(INSTALL) -d /etc/comedi/calibrations
-

diff --git a/comedi_calibrate/Makefile.am b/comedi_calibrate/Makefile.am
index 5a3f5e0a8e880bb043acbe894bf27f8c08f163d3..5a70a869687afb1f175fcc536520ca8000b1b433 100644 (file)
--- a/comedi_calibrate/Makefile.am
+++ b/comedi_calibrate/Makefile.am
@@ -8,5 +8,8 @@ comedi_calibrate_SOURCES = \
 comedi_calibrate_CFLAGS = $(COMEDILIB_CFLAGS)
 comedi_calibrate_LDADD = $(COMEDILIB_LIBS)
 
+install-data-local:
+       $(INSTALL) -d /etc/comedi/calibrations
+
 EXTRA_DIST = results
 

diff --git a/etc/pcmcia/comedi b/etc/pcmcia/comedi
index 20adbeaba235c63ff05b766343a1f32cd65705c5..1ff2afcdf7583e228260a79006e4cdaa27e62e7a 100755 (executable)
--- a/etc/pcmcia/comedi
+++ b/etc/pcmcia/comedi
@@ -15,7 +15,7 @@ case "$ACTION" in
 'start')
 
     #echo /usr/sbin/comedi_config /dev/comedi0 $2
-    export PATH=/sbin:/usr/sbin:/usr/local/sbin:$PATH;
+    PATH=/sbin:/usr/sbin:/usr/local/sbin:$PATH;
     comedi_config /dev/comedi0 $2
 
     start_fn $DEVICE