[Skiboot] [PATCH] pflash: s/PREFIX/prefix/; s/INCDIR/includedir/; s/LIBDIR/libdir/ to match common practice

Stewart Smith stewart at linux.vnet.ibm.com
Thu Sep 22 16:09:59 AEST 2016


We will now match autotools in the use of capitals:
https://www.gnu.org/software/automake/manual/html_node/Standard-Directory-Variables.html

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 external/pflash/rules.mk |  2 +-
 external/shared/Makefile | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/external/pflash/rules.mk b/external/pflash/rules.mk
index c8a1476bf329..333ffe52bf3c 100644
--- a/external/pflash/rules.mk
+++ b/external/pflash/rules.mk
@@ -19,7 +19,7 @@ OBJS		:= $(PFLASH_OBJS) $(SHARED)
 INSTALLDEPS	+= install-shared
 
 install-shared:
-	$(MAKE) -C ../shared install PREFIX=$(PREFIX)
+	$(MAKE) -C ../shared install prefix=$(prefix)
 
 $(SHARED):
 	$(MAKE) -C ../shared
diff --git a/external/shared/Makefile b/external/shared/Makefile
index e0b3ff3918a8..88e95b728e26 100644
--- a/external/shared/Makefile
+++ b/external/shared/Makefile
@@ -3,9 +3,9 @@ GET_ARCH := ../../external/common/get_arch.sh
 include ../../external/common/rules.mk
 include rules.mk
 
-PREFIX ?= /usr/local/
-LIBDIR := $(PREFIX)/lib
-INCDIR := $(PREFIX)/include/libflash
+prefix ?= /usr/local/
+libdir := $(prefix)/lib
+includedir := $(prefix)/include/libflash
 
 ifneq ($(ARCH), ARCH_ARM)
 CFLAGS += -m64
@@ -39,15 +39,15 @@ all: links arch_links $(OBJS)
 	$(CC) -shared -Wl,-soname,libflash.so -o $(SHARED_NAME) $(OBJS)
 
 install-lib: all
-	install -D -m 0755 $(SHARED_NAME) $(LIBDIR)/$(SHARED_NAME)
-	ln -sf $(SHARED_NAME) $(LIBDIR)/libflash.so
+	install -D -m 0755 $(SHARED_NAME) $(libdir)/$(SHARED_NAME)
+	ln -sf $(SHARED_NAME) $(libdir)/libflash.so
 
 install-dev: links arch_links
-	mkdir -p $(INCDIR)
-	install -m 0644 $(LIBFLASH_H) $(ARCHFLASH_H) $(INCDIR)
+	mkdir -p $(includedir)
+	install -m 0644 $(LIBFLASH_H) $(ARCHFLASH_H) $(includedir)
 
 install: install-lib install-dev
 
 uninstall:
-	rm -f $(LIBDIR)/libflash*
-	rm -rf $(INCDIR)
+	rm -f $(libdir)/libflash*
+	rm -rf $(includedir)
-- 
2.1.4



More information about the Skiboot mailing list