From 6ba4f05f5dec71b5e2214461625de18a47a7802e Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Sat, 25 Oct 2008 00:12:14 +0200 Subject: Seems to work: installs fine, uninstalls fine Signed-off-by: Henrik Rydberg --- Makefile | 5 ++++- debian/changelog | 2 +- usr/src/dkms_source_tree/scripts/bcm5974-post-install | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b750188..e10f8d1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ NAME = bcm5974 VERSION = 0.99 SRC = usr/src +ETC = etc/modprobe.d TARBALL = $(NAME)-$(VERSION).dkms.tar.gz PATCH = ./scripts/patch-name-version.sh $(NAME) $(VERSION) @@ -18,7 +19,9 @@ distclean: clean install: $(SRC)/$(TARBALL) install -d "$(DESTDIR)/$(SRC)" - (cd $(SRC); install -m 644 $(NAME)-$(VERSION).dkms.tar.gz "$(DESTDIR)/$(SRC)") + install -d "$(DESTDIR)/$(ETC)" + install -m 644 $(SRC)/$(NAME)-$(VERSION).dkms.tar.gz "$(DESTDIR)/$(SRC)" + install -m 644 $(ETC)/$(NAME) "$(DESTDIR)/$(ETC)" bump: $(PATCH) debian/postinst diff --git a/debian/changelog b/debian/changelog index fed1652..b13c3f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -bcm5974-dkms (1.0) unstable; urgency=low +bcm5974-dkms (0.99) unstable; urgency=low * Add support for MacBookPro 5,1 (unibody) * Distribute package at launchpad as version 1.0 diff --git a/usr/src/dkms_source_tree/scripts/bcm5974-post-install b/usr/src/dkms_source_tree/scripts/bcm5974-post-install index de5094c..8207a45 100755 --- a/usr/src/dkms_source_tree/scripts/bcm5974-post-install +++ b/usr/src/dkms_source_tree/scripts/bcm5974-post-install @@ -24,7 +24,6 @@ ETCPATH=/etc/modprobe.d/$DRIVER echo ----------------------------------------------------------------------- -DIR=`dirname $0` LSUSB=/usr/sbin/lsusb PAT_HEAD="options usbhid quirks=" @@ -55,7 +54,8 @@ else fi if [ "$SED" != "" ]; then - cat $DIR/..$ETCPATH | sed "$SED" > $ETCPATH + cat $ETCPATH | sed "$SED" > $ETCPATH.tmp + mv $ETCPATH.tmp $ETCPATH exit 0 else echo No suitable device found -- cgit v1.2.3