Add cgpt utility to installable binaries.
Review URL: http://codereview.chromium.org/2490001
diff --git a/utility/Makefile b/utility/Makefile
index 3cdbb82..8406e0e 100644
--- a/utility/Makefile
+++ b/utility/Makefile
@@ -20,6 +20,8 @@
$(TOP)/vkernel/kernel_image.o
SUBDIRS = cgpt
+DESTDIR ?= /opt/bin
+
TARGET_BINS = dumpRSAPublicKey \
firmware_utility \
gbb_utility \
@@ -33,7 +35,7 @@
subdirs:
set -e; \
for i in $(SUBDIRS); do \
- $(MAKE) -C $$i; \
+ $(MAKE) -C $$i $(MAKECMDGOALS); \
done
dumpRSAPublicKey: dumpRSAPublicKey.c
@@ -63,7 +65,7 @@
done
rm -f $(TARGET_BINS)
-install: $(TARGET_BINS)
+install: $(TARGET_BINS) subdirs
mkdir -p $(DESTDIR)
- cp -f $^ $(DESTDIR)
- chmod a+rx $(patsubst %,$(DESTDIR)/%,$^)
+ cp -f $(TARGET_BINS) $(DESTDIR)
+ chmod a+rx $(patsubst %,$(DESTDIR)/%,$(TARGET_BINS))
diff --git a/utility/cgpt/Makefile b/utility/cgpt/Makefile
index adb12ab..a6f7e79 100644
--- a/utility/cgpt/Makefile
+++ b/utility/cgpt/Makefile
@@ -8,6 +8,8 @@
CFLAGS += -Wall -Werror -ggdb
LIBS += $(FWLIB)
+DESTDIR ?= /opt/bin
+
all: cgpt
cgpt: cgpt.o cgpt_add_modify_delete.o cgpt_attribute.o cgpt_dev.o \
@@ -18,3 +20,8 @@
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
clean:
rm -f cgpt *.o *~
+
+install: cgpt
+ mkdir -p $(DESTDIR)
+ cp -f $^ $(DESTDIR)
+ chmod a+rx $(patsubst %,$(DESTDIR)/%,$^)