]>
Commit | Line | Data |
---|---|---|
c63a3d2f MT |
1 | From 3f40a425e763edfde77a9a6e05ed09b0676d8fa9 Mon Sep 17 00:00:00 2001 |
2 | From: Peter Jones <pjones@cutlet.install.bos.redhat.com> | |
3 | Date: Fri, 3 Oct 2008 14:40:56 -0400 | |
4 | Subject: [PATCH 1/7] Fix usage of INSTALLROOT, PREFIX, and LIBDIR. | |
5 | ||
6 | I screwed it up last time. | |
7 | --- | |
8 | Make.defaults | 6 +++--- | |
9 | inc/Makefile | 16 ++++++++-------- | |
10 | 2 files changed, 11 insertions(+), 11 deletions(-) | |
11 | ||
12 | diff --git a/Make.defaults b/Make.defaults | |
13 | index bf162c5..6278fa7 100644 | |
14 | --- a/Make.defaults | |
15 | +++ b/Make.defaults | |
16 | @@ -38,8 +38,9 @@ | |
17 | # Where to install the package. GNU-EFI will create and access | |
18 | # lib and include under the root | |
19 | # | |
20 | -INSTALLROOT=/usr/local | |
21 | -LIBDIR=lib | |
22 | +INSTALLROOT:= / | |
23 | +PREFIX := /usr/local | |
24 | +LIBDIR := ${PREFIX}/lib | |
25 | ||
26 | TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) | |
27 | ||
28 | @@ -73,7 +74,6 @@ endif | |
29 | ||
30 | ifeq ($(ARCH), x86_64) | |
31 | CFLAGS += -mno-red-zone | |
32 | - LIBDIR = lib | |
33 | ifeq ($(HOSTARCH), ia32) | |
34 | ARCH3264 = -m64 | |
35 | endif | |
36 | diff --git a/inc/Makefile b/inc/Makefile | |
37 | index 9683be5..71fded5 100644 | |
38 | --- a/inc/Makefile | |
39 | +++ b/inc/Makefile | |
40 | @@ -13,15 +13,15 @@ all: | |
41 | clean: | |
42 | ||
43 | install: | |
44 | - mkdir -p $(INSTALLROOT)/include/efi | |
45 | - mkdir -p $(INSTALLROOT)/include/efi/protocol | |
46 | - mkdir -p $(INSTALLROOT)/include/efi/$(ARCH) | |
47 | - $(INSTALL) -m 644 *.h $(INSTALLROOT)/include/efi | |
48 | - $(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)/include/efi/protocol | |
49 | - $(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)/include/efi/$(ARCH) | |
50 | + mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi | |
51 | + mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol | |
52 | + mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH) | |
53 | + $(INSTALL) -m 644 *.h $(INSTALLROOT)$(PREFIX)/include/efi | |
54 | + $(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol | |
55 | + $(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH) | |
56 | ifeq ($(ARCH),ia64) | |
57 | - mkdir -p $(INSTALLROOT)/include/efi/protocol/ia64 | |
58 | - $(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)/include/efi/protocol/ia64 | |
59 | + mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64 | |
60 | + $(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64 | |
61 | endif | |
62 | ||
63 | include $(SRCDIR)/../Make.rules | |
64 | -- | |
65 | 1.7.10.4 | |
66 |