X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=debian%2Frules;h=a1c3ae16bac26c8d927cfc0c6671ac2e214422ce;hp=b32058d2f4afa0838b3f050fa7ca3e8149cededd;hb=e5ae97fdf02635dee08648b2f2fb4006db269b17;hpb=70b40a204d7940f5a43043f6d32c9f2f99b1dc87

diff --git a/debian/rules b/debian/rules
index b32058d..a1c3ae1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
 	$(MAKE)
+	cd mbr && $(MAKE) && cd ..
 	touch build-stamp
 
 clean:
@@ -25,34 +28,37 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) clean
-	dh_clean 
+	cd mbr && $(MAKE) clean && cd ..
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs usr/share/grml2usb/lilo usr/share/grml2usb/grub
+	dh_clean -k
+	dh_installdirs usr/share/grml2usb/grub usr/share/grml2usb/mbr
 
 	# Add here commands to install the package into debian/grml2usb.
-	install -m 755 grml2usb             debian/grml2usb/usr/sbin/
-	install -m 755 lilo/lilo.static     debian/grml2usb/usr/share/grml2usb/lilo/lilo.static
-	install -m 644 grub/splash.xpm.gz   debian/grml2usb/usr/share/grml2usb/grub/splash.xpm.gz
-	install -m 644 grub/stage2_eltorito debian/grml2usb/usr/share/grml2usb/grub/stage2_eltorito
+	install -m 755 grml2usb               debian/grml2usb/usr/sbin/grml2usb
+	install -m 755 grml2iso               debian/grml2usb/usr/sbin/grml2iso
+	install -m 644 mbr/mbrmgr             debian/grml2usb/usr/share/grml2usb/mbr/mbrmgr
+	install -m 644 mbr/mbrldr             debian/grml2usb/usr/share/grml2usb/mbr/mbrldr
+	cp -a          grub/                  debian/grml2usb/usr/share/grml2usb/
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
 # We have nothing to do by default.
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installman grml2usb.8
-	dh_link
+	dh_installchangelogs
+	dh_installdocs TODO
+	dh_installman grml2usb.8 grml2iso.8
 	dh_strip
 	dh_compress
+	mkdir -p debian/grml2usb/usr/share/lintian/overrides/
+	cp -av debian/overrides debian/grml2usb/usr/share/lintian/overrides/grml2usb
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps