Change installation directory for tpm-util

changing the path from the user's home directory to
root's home directory for duplicate and import utlity

Change-Id: I1550492925fdd0e3096e7aab853c16896819d61c
Issue-ID: AAF-334
Signed-off-by: Pramod Raghavendra Jayathirth <pramod.raghavendra.jayathirth@intel.com>

diff --git a/tpm-util/duplicate/sampleMakefile b/tpm-util/duplicate/sampleMakefile
index 5139954..d3745d8 100644 (file)
--- a/tpm-util/duplicate/sampleMakefile
+++ b/tpm-util/duplicate/sampleMakefile
@@ -6,7 +6,7 @@ AR = ar
 LDDFLAGS += -fPIC
 ARFLAGS = -rc
 
-TSS_DIR?=/home/pramod/tpm2-tss
+TSS_DIR?=/tpm2-tss
 OPENSSL_DIR?=/usr/local/bin/openssl
 
 OUTPUT=ossl_tpm_duplicate
@@ -15,19 +15,19 @@ OBJS=       util.o \
         marshal.o \
         crypto_aux.o \
         tpm_duplication_aux.o \
-        main.o 
+        main.o
 
 
 CFLAGS += -g -fPIC -I./include -I${TSS_DIR}/include/ -I$(TSS_DIR)/sysapi/include #-I${OPENSSL_DIR}/include/
 
-#LDFLAGS += -L${OPENSSL_DIR}/lib -ldl -L/usr/local/lib/ -lsapi -ltcti-device -ltcti-tabrmd 
-LDFLAGS += -ldl -L/usr/local/lib/ -lsapi -ltcti-device -ltcti-tabrmd 
+
+LDFLAGS += -ldl -L/usr/local/lib/ -lsapi -ltcti-device -ltcti-tabrmd
 
 LIBS = -lpthread -lcrypto -lssl
 
 %.o : %.c
        $(CC) -c $(CFLAGS) $< -o $@
-       
+
 
 $(OUTPUT): $(OBJS)
        $(CC) $(OBJS) $(LDFLAGS) ${LIBS} -o $(OUTPUT)
@@ -39,4 +39,4 @@ install:
        @set -e; for i in $(OUTPUT); do mv $$i ../../bin/$$i ; done
 
 clean:
-       rm -f *.o $(OUTPUT) *.so 
+       rm -f *.o $(OUTPUT) *.so

diff --git a/tpm-util/import/sampleMakefile b/tpm-util/import/sampleMakefile
index 55c180a..96ac729 100644 (file)
--- a/tpm-util/import/sampleMakefile
+++ b/tpm-util/import/sampleMakefile
@@ -6,24 +6,23 @@ AR = ar
 LDDFLAGS += -fPIC
 ARFLAGS = -rc
 
-TSS_DIR?=/home/pramod/tpm2-tss
+TSS_DIR?=/tpm2-tss
 
 OUTPUT=ossl_tpm_import
 
 OBJS=  util.o \
                tpm_wrapper.o \
-               main.o 
+               main.o
 
+CFLAGS += -g -fPIC -I./include -I${TSS_DIR}/include/ -I$(TSS_DIR)/sysapi/include
 
-CFLAGS += -g -fPIC -I./include -I${TSS_DIR}/include/ -I$(TSS_DIR)/sysapi/include 
-
-LDFLAGS += -ldl -L/usr/local/lib/ -lsapi -ltcti-device -ltcti-tabrmd 
+LDFLAGS += -ldl -L/usr/local/lib/ -lsapi -ltcti-device -ltcti-tabrmd
 
 LIBS = -lpthread -lcrypto -lssl
 
 %.o : %.c
        $(CC) -c $(CFLAGS) $< -o $@
-       
+
 
 $(OUTPUT): $(OBJS)
        $(CC) $(OBJS) $(LDFLAGS) ${LIBS} -o $(OUTPUT)
@@ -35,4 +34,4 @@ install:
        @set -e; for i in $(OUTPUT); do mv $$i ../../bin/$$i ; done
 
 clean:
-       rm -f *.o $(OUTPUT) *.so 
+       rm -f *.o $(OUTPUT) *.so