make KBUILD_BASENAME and KBUILD_MODNAME hacks more robust

diff --git a/configure.ac b/configure.ac
index e8307dd7eaf5435b7767aaaf8ec9d9869cdfc942..7eece8baf4f1addf7a169678b4fad48d2e2bf213 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
-AC_INIT(comedi/comedi_fops.c)
-
-AM_CONFIG_HEADER(config.h)
+AC_INIT
+AC_CONFIG_SRCDIR([comedi/comedi_fops.c])
+AC_CONFIG_HEADERS(config.h)
 
 AC_CANONICAL_TARGET([])
 
@@ -55,8 +55,8 @@ CC=$LINUX_CC
 #ERROR_CFLAGS="-Werror"
 
 [COMEDI_CFLAGS="$ERROR_CFLAGS -I\$(top_srcdir)/include/\
- -DKBUILD_MODNAME=\$(shell echo \$@ | sed 's/\(.*\)\.o/\1/g' | sed 's/\(.*\)_ko.*/\1/g')\
- -DKBUILD_BASENAME=\$(shell echo \$< | sed 's/\(.*\)\.c/\1/g')"]
+ -DKBUILD_MODNAME=\$(shell basename \$@ .o | sed 's/\(.*\)_ko.*/\1/g')\
+ -DKBUILD_BASENAME=\$(shell basename \$< .c)"]
 AC_SUBST(COMEDI_CFLAGS)
 
 AC_ARG_ENABLE([pcmcia],[  --disable-pcmcia     Disable support for PCMCIA devices],