diff -Nru oss4-4.2-build2005/debian/changelog oss4-4.2-build2005/debian/changelog --- oss4-4.2-build2005/debian/changelog 2012-02-05 07:49:48.000000000 -0500 +++ oss4-4.2-build2005/debian/changelog 2012-12-23 08:31:03.000000000 -0500 @@ -1,3 +1,10 @@ +oss4 (4.2-build2005-2ubuntu2) precise; urgency=low + + * check for /lib/modules/${kernelver}/build in addition of + /lib/modules/${kernelver}/source (LP: 969733) + + -- Dave Lentz Sun, 23 Dec 2012 08:30:17 -0500 + oss4 (4.2-build2005-2ubuntu1) precise; urgency=low * Merge from debian/unstable, remaining changes: diff -Nru oss4-4.2-build2005/debian/oss4-dkms.dkms.in oss4-4.2-build2005/debian/oss4-dkms.dkms.in --- oss4-4.2-build2005/debian/oss4-dkms.dkms.in 2012-01-28 16:41:15.000000000 -0500 +++ oss4-4.2-build2005/debian/oss4-dkms.dkms.in 2012-12-23 08:26:15.000000000 -0500 @@ -97,7 +97,8 @@ DEST_MODULE_LOCATION[30]="/updates/dkms/" DEST_MODULE_LOCATION[31]="/updates/dkms/" AUTOINSTALL=yes -MAKE[0]="cp /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core && \ +MAKE[0]="test ! -e /lib/modules/${kernelver}/build/include/linux/limits.h || cp /lib/modules/${kernelver}/build/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \ + test ! -e /lib/modules/${kernelver}/source/include/linux/limits.h || cp /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \ make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules && \ make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers osscore_symbols.inc && \ make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules"