build fixes

[debian/elilo] / debian / rules

diff --git a/debian/rules b/debian/rules
index 17877d2a0b30e3635e6da7f11c59eb26328f6dca..06b6cadc624a72d1e18b5c3cf0f87f88148fd12f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+buildarch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -15,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
@@ -26,6 +38,8 @@ clean:
 
        [ ! -f Makefile ] || $(MAKE) clean
 
+       rm -rf debian/build32 debian/build64
+
        debconf-updatepo
        dh_clean
 
@@ -35,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 < \
@@ -46,8 +73,6 @@ 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
@@ -58,8 +83,6 @@ binary-arch: build install
        dh_installexamples examples/netboot examples/textmenu_chooser
        cp debian/sys2ansi.pl \
                debian/elilo/usr/share/doc/elilo/examples/textmenu_chooser/
-       # ick ... hack to handle CVS directories in upstream tarball
-       rm -r debian/elilo/usr/share/doc/elilo/examples/*/CVS
        dh_installmenu
        dh_installcron
        dh_installman debian/elilo.8 debian/eliloalt.8