| Patrick Williams | 4839255 | 2016-08-05 15:44:07 -0500 | [diff] [blame] | 1 | From 3cd3e18ef5743d3f78fa540af1141db8de1fdbcc Mon Sep 17 00:00:00 2001 |
| 2 | From: Patrick Williams <patrick@stwcx.xyz> |
| 3 | Date: Fri, 5 Aug 2016 16:02:37 -0500 |
| 4 | Subject: [PATCH] external: Use more-standard PREFIX vs prefix |
| 5 | |
| 6 | Distro packaging tools typically use PREFIX instead of prefix, |
| 7 | so change all references to lower-case prefix to upper-case. |
| 8 | |
| 9 | pflash uses PREFIX since at least b2649b. |
| 10 | |
| 11 | Signed-off-by: Patrick Williams <patrick@stwcx.xyz> |
| 12 | --- |
| 13 | external/gard/rules.mk | 6 +++--- |
| 14 | external/opal-prd/Makefile | 6 +++--- |
| 15 | external/xscom-utils/Makefile | 6 +++--- |
| 16 | 3 files changed, 9 insertions(+), 9 deletions(-) |
| 17 | |
| 18 | diff --git a/external/gard/rules.mk b/external/gard/rules.mk |
| 19 | index 0dd14ed..dfe93d5 100644 |
| 20 | --- a/external/gard/rules.mk |
| 21 | +++ b/external/gard/rules.mk |
| 22 | @@ -7,9 +7,9 @@ OBJS += $(LIBFLASH_OBJS) |
| 23 | OBJS += common-arch_flash.o |
| 24 | EXE = gard |
| 25 | |
| 26 | -prefix = /usr/local/ |
| 27 | -sbindir = $(prefix)/sbin |
| 28 | -datadir = $(prefix)/share |
| 29 | +PREFIX = /usr/local/ |
| 30 | +sbindir = $(PREFIX)/sbin |
| 31 | +datadir = $(PREFIX)/share |
| 32 | mandir = $(datadir)/man |
| 33 | |
| 34 | GARD_VERSION ?= $(shell ./make_version.sh $(EXE)) |
| 35 | diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile |
| 36 | index 7482af3..8318348 100644 |
| 37 | --- a/external/opal-prd/Makefile |
| 38 | +++ b/external/opal-prd/Makefile |
| 39 | @@ -3,9 +3,9 @@ LDFLAGS += -m64 |
| 40 | ASFLAGS = -m64 |
| 41 | CPPFLAGS += -I. -I../../include -I../../ |
| 42 | |
| 43 | -prefix = /usr/local/ |
| 44 | -sbindir = $(prefix)/sbin |
| 45 | -datadir = $(prefix)/share |
| 46 | +PREFIX = /usr/local/ |
| 47 | +sbindir = $(PREFIX)/sbin |
| 48 | +datadir = $(PREFIX)/share |
| 49 | mandir = $(datadir)/man |
| 50 | |
| 51 | all: links arch_links | opal-prd |
| 52 | diff --git a/external/xscom-utils/Makefile b/external/xscom-utils/Makefile |
| 53 | index 3fee247..9695105 100644 |
| 54 | --- a/external/xscom-utils/Makefile |
| 55 | +++ b/external/xscom-utils/Makefile |
| 56 | @@ -3,9 +3,9 @@ CC = $(CROSS_COMPILE)gcc |
| 57 | XSCOM_VERSION ?= $(shell ../../make_version.sh xscom-utils) |
| 58 | CFLAGS += -O2 -g -Wall -m64 |
| 59 | |
| 60 | -prefix = /usr/local/ |
| 61 | -sbindir = $(prefix)/sbin |
| 62 | -datadir = $(prefix)/share |
| 63 | +PREFIX = /usr/local/ |
| 64 | +sbindir = $(PREFIX)/sbin |
| 65 | +datadir = $(PREFIX)/share |
| 66 | mandir = $(datadir)/man |
| 67 | |
| 68 | %.o: %.c |
| 69 | -- |
| 70 | 2.9.0 |
| 71 | |