[Forensics-changes] [SCM] debian-forensics/recoverdm branch, debian-sid, updated. upstream/0.19-18-g9aeadfc

[Daniel Baumann]

The following commit has been merged in the debian-sid branch:
commit 9aeadfce87ac93411c37beb9afd77ab6b641b7df
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 11 22:47:37 2008 +0100

    Reverting unneeded upstream modification, using install target of rules.

diff --git a/Makefile b/Makefile
index 50b310e..b0f8cfb 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,3 @@ package: clean
 	cp *.c *.h *.1 Makefile readme.txt license.txt recoverdm-$(VERSION)
 	tar czf recoverdm-$(VERSION).tgz recoverdm-$(VERSION)
 	rm -rf recoverdm-$(VERSION)
-
-install: all
-	install -m 0755 recoverdm $(DESTDIR)/usr/bin
-	install -m 0755 mergebad $(DESTDIR)/usr/bin
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 415f082..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin
diff --git a/debian/rules b/debian/rules
index e02b0cf..a4e8cb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/recoverdm install
+	install -D -m 0755 recoverdm debian/recoverdm/usr/bin/recoverdm
+	install -D -m 0755 mergebad debian/recoverdm/usr/bin/mergebad
 
 binary: binary-arch binary-indep
 

-- 
debian-forensics/recoverdm