From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict

---
 src/Makefile |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 2ab0bb5..9f399e1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,14 +23,16 @@
 
 MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
 
+PREFIX = $(ROOT)/build
+
 ifeq ($(DEBUG),y)
   MYLIBS = $(LIBSQUEUE)
 else
   MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
 endif
 
-all: build
- 
+all: install
+
 
 build: $(MYLIBS)
 
@@ -55,7 +57,7 @@
 	install -d $(PREFIX)/lib/
 	install -m 644 $^ $(PREFIX)/lib/
 	install -d $(PREFIX)/include/
-	install -m 644 $(MINCLUDE)/* $(PREFIX)/include/
+	install -m 644 ./*.h ./queue/include/* ./socket/include/* ./util/include/* $(PREFIX)/include/
 
 clean:
 	rm -f $(TEMPFILES)

--
Gitblit v1.8.0