X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=06b6cadc624a72d1e18b5c3cf0f87f88148fd12f;hb=b660193b9ae7fe01f3a3fcdf463fbdd0f6b0ceac;hp=1ddd0c5fbe881e1deb7f2dae30430afb8eb100fe;hpb=176953673e992bd3812c32dc5d13eb8fa9b3c5b7;p=debian%2Felilo

diff --git a/debian/rules b/debian/rules
index 1ddd0c5..06b6cad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+buildarch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 configure: configure-stamp
 configure-stamp:
@@ -18,6 +17,16 @@ build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
+ifeq ($(buildarch), i386)
+	mkdir debian/build64
+	$(MAKE) -C debian/build64 -f ../../Makefile SRCDIR=../.. ARCH=x86_64
+endif
+
+ifeq ($(buildarch), amd64)
+	mkdir debian/build32
+	$(MAKE) -C debian/build32 -f ../../Makefile SRCDIR=../.. ARCH=ia32
+endif
+
 	$(MAKE)
 
 	touch build-stamp
@@ -27,8 +36,11 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 
+	rm -rf debian/build32 debian/build64
+
+	debconf-updatepo
 	dh_clean
 
 install: build
@@ -37,7 +49,20 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
+ifeq ($(buildarch), i386)
+	mkdir -p debian/elilo/usr/lib64/elilo
+	cp debian/build64/elilo.efi debian/elilo/usr/lib64/elilo/elilo.efi
+	chmod 0644 debian/elilo/usr/lib64/elilo/elilo.efi
+endif
+
+ifeq ($(buildarch), amd64)
+	mkdir -p debian/elilo/emul/ia32-linux/usr/lib/elilo
+	cp debian/build32/elilo.efi debian/elilo/emul/ia32-linux/usr/lib/elilo/elilo.efi
+	chmod 0644 debian/elilo/emul/ia32-linux/usr/lib/elilo/elilo.efi
+endif
+
 	cp elilo.efi debian/elilo/usr/lib/elilo/elilo.efi
+	chmod 0644 debian/elilo/usr/lib/elilo/elilo.efi
 
 	# dynamically determine version string from changelog
 	sed s/'##VERSION##'/"`IFS=\"()\" read pkg ver other < \
@@ -48,14 +73,13 @@ install: build
 	cp tools/eliloalt debian/elilo/usr/sbin/eliloalt
 	chmod 0755 debian/elilo/usr/sbin/eliloalt
 
-	chmod 0644 debian/elilo/usr/lib/elilo/elilo.efi
-
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
+	dh_installdebconf
 	dh_installexamples examples/netboot examples/textmenu_chooser
 	cp debian/sys2ansi.pl \
 		debian/elilo/usr/share/doc/elilo/examples/textmenu_chooser/