Skip to content

Commit 49aacd8

Browse files
committed
Fix make install
Summary: See facebook/rocksdb#283 Test Plan: make install/uninstall Reviewers: ljin, sdong, yhchiang Reviewed By: yhchiang Subscribers: leveldb Differential Revision: https://reviews.facebook.net/D23373
1 parent acb9348 commit 49aacd8

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

Makefile

+11-17
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,20 @@ endif
5353
INSTALL_PATH ?= /usr/local
5454

5555
uninstall:
56-
rm -rf $(INSTALL_PATH)/include/rocksdb
57-
if [ -a $(LIBRARY) ]; then \
58-
rm -rf $(INSTALL_PATH)/lib/$(LIBRARY); \
59-
fi
60-
if [ -a $(SHARED) ]; then \
61-
rm -rf $(INSTALL_PATH)/lib/$(SHARED); \
62-
fi
56+
@rm -rf $(INSTALL_PATH)/include/rocksdb
57+
@rm -rf $(INSTALL_PATH)/lib/$(LIBRARY)
58+
@rm -rf $(INSTALL_PATH)/lib/$(SHARED)
6359

6460
install:
65-
install -d $(INSTALL_PATH)/include/rocksdb
66-
install -d $(INSTALL_PATH)/lib
67-
for header in `find "include/rocksdb" -type f -name *.h`; do \
68-
install -C -m 644 -D $$header $(INSTALL_PATH)/$$header; \
61+
@install -d $(INSTALL_PATH)/lib
62+
@for header_dir in `find "include/rocksdb" -type d`; do \
63+
install -d $(INSTALL_PATH)/$$header_dir; \
6964
done
70-
if [ -a $(LIBRARY) ]; then \
71-
install -C -m 644 $(LIBRARY) $(INSTALL_PATH)/lib/.; \
72-
fi;
73-
if [ -a $(SHARED) ]; then \
74-
install -C -m 644 $(SHARED) $(INSTALL_PATH)/lib/.; \
75-
fi;
65+
@for header in `find "include/rocksdb" -type f -name *.h`; do \
66+
install -C -m 644 $$header $(INSTALL_PATH)/$$header; \
67+
done
68+
@[ ! -e $(LIBRARY) ] || install -C -m 644 $(LIBRARY) $(INSTALL_PATH)/lib
69+
@[ ! -e $(SHARED) ] || install -C -m 644 $(SHARED) $(INSTALL_PATH)/lib
7670
#-------------------------------------------------
7771

7872
WARNING_FLAGS = -Wall -Werror -Wsign-compare

0 commit comments

Comments
 (0)