projects
/
debian
/
elilo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b637a47
)
build fixes
author
Bdale Garbee
<bdale@gag.com>
Mon, 2 Nov 2009 05:25:23 +0000
(22:25 -0700)
committer
Bdale Garbee
<bdale@gag.com>
Mon, 2 Nov 2009 05:25:23 +0000
(22:25 -0700)
Make.defaults
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
diff --git
a/Make.defaults
b/Make.defaults
index 8ec559d47cf2f26a4a195d3e4e727b241231afe1..1eb95ccb8cf28b4e3ca4affe3f162fb98871d440 100644
(file)
--- a/
Make.defaults
+++ b/
Make.defaults
@@
-62,8
+62,8
@@
EFICRT0 = /usr/lib
CDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
TOPDIR =
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)
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 9dfd151a3205d72df710755aae4de11a349ce727..06b6cadc624a72d1e18b5c3cf0f87f88148fd12f 100755
(executable)
--- 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/
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
dh_installmenu
dh_installcron
dh_installman debian/elilo.8 debian/eliloalt.8