From: Bdale Garbee Date: Mon, 2 Nov 2009 05:25:23 +0000 (-0700) Subject: build fixes X-Git-Tag: debian/3.12-1~2^2 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=67ca4737349567922440f3f3862a49e2ffe44fdc;p=debian%2Felilo build fixes --- diff --git a/Make.defaults b/Make.defaults index 8ec559d..1eb95cc 100644 --- a/Make.defaults +++ b/Make.defaults @@ -62,8 +62,8 @@ EFICRT0 = /usr/lib CDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) TOPDIR = -HOSTARCH = $(dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,) -ARCH := $(dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,) +HOSTARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,) +ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,) INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -I$(TOPDIR)/efi110 CPPFLAGS = -DCONFIG_$(ARCH) diff --git a/debian/rules b/debian/rules index 9dfd151..06b6cad 100755 --- a/debian/rules +++ b/debian/rules @@ -83,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