Browse Source

./configure --prefix=PREFIX --incdir=INSTALL_INCDIR --libdir=INSTALL_LIBDIR

hewei.it 4 years ago
parent
commit
9ce06f59f9
5 changed files with 28 additions and 3 deletions
  1. 1 0
      Makefile
  2. 3 2
      Makefile.vars
  3. 4 0
      config.ini
  4. 4 1
      config.mk
  5. 16 0
      configure

+ 1 - 0
Makefile

@@ -64,6 +64,7 @@ libhv:
 
 
 install:
 install:
 	$(MKDIR) $(INSTALL_INCDIR)
 	$(MKDIR) $(INSTALL_INCDIR)
+	$(MKDIR) $(INSTALL_LIBDIR)
 	$(CP) include/hv/* $(INSTALL_INCDIR)
 	$(CP) include/hv/* $(INSTALL_INCDIR)
 	$(CP) lib/libhv.*  $(INSTALL_LIBDIR)
 	$(CP) lib/libhv.*  $(INSTALL_LIBDIR)
 
 

+ 3 - 2
Makefile.vars

@@ -2,8 +2,9 @@ MKDIR = -mkdir -p 2>/dev/null
 CP = -cp -r 2>/dev/null
 CP = -cp -r 2>/dev/null
 RM = -rm -r 2>/dev/null
 RM = -rm -r 2>/dev/null
 
 
-INSTALL_INCDIR=/usr/local/include/hv
-INSTALL_LIBDIR=/usr/local/lib
+PREFIX ?= /usr/local
+INSTALL_INCDIR ?= $(PREFIX)/include/hv
+INSTALL_LIBDIR ?= $(PREFIX)/lib
 
 
 BASE_HEADERS =  base/hplatform.h\
 BASE_HEADERS =  base/hplatform.h\
 				\
 				\

+ 4 - 0
config.ini

@@ -1,6 +1,10 @@
 # Don't modify this file, you should modify config.mk or
 # Don't modify this file, you should modify config.mk or
 # run ./configure --with-MODULE --enable-FEATURE
 # run ./configure --with-MODULE --enable-FEATURE
 
 
+PREFIX=/usr/local
+INSTALL_INCDIR=$(PREFIX)/include/hv
+INSTALL_LIBDIR=$(PREFIX)/lib
+
 # modules
 # modules
 # include icmp dns ftp smtp
 # include icmp dns ftp smtp
 WITH_PROTOCOL=no
 WITH_PROTOCOL=no

+ 4 - 1
config.mk

@@ -1,4 +1,7 @@
 
 
+PREFIX=/usr/local
+INSTALL_INCDIR=$(PREFIX)/include/hv
+INSTALL_LIBDIR=$(PREFIX)/lib
 WITH_PROTOCOL=no
 WITH_PROTOCOL=no
 WITH_EVPP=yes
 WITH_EVPP=yes
 WITH_HTTP=yes
 WITH_HTTP=yes
@@ -13,4 +16,4 @@ WITH_CURL=no
 WITH_NGHTTP2=no
 WITH_NGHTTP2=no
 WITH_OPENSSL=no
 WITH_OPENSSL=no
 WITH_MBEDTLS=no
 WITH_MBEDTLS=no
-CONFIG_DATE=20210415
+CONFIG_DATE=20210430

+ 16 - 0
configure

@@ -8,6 +8,10 @@ print_help() {
 Usage: ./configure [--option] ...
 Usage: ./configure [--option] ...
 
 
 options:
 options:
+  --prefix=PREFIX           (DEFAULT: $PREFIX)
+  --incdir=INSTALL_INCDIR   (DEFAULT: $PREFIX/include/hv)
+  --libdir=INSTALL_LIBDIR   (DEFAULT: $PREFIX/lib)
+
   --with-MODULE
   --with-MODULE
   --without-MODULE
   --without-MODULE
   --enable-FEATURE
   --enable-FEATURE
@@ -46,6 +50,18 @@ do
             print_help
             print_help
             exit 0
             exit 0
             ;;
             ;;
+        --prefix=*)
+            KEY="PREFIX"
+            VAL=${opt:9}
+            ;;
+        --incdir=*)
+            KEY="INSTALL_INCDIR"
+            VAL=${opt:9}
+            ;;
+        --libdir=*)
+            KEY="INSTALL_LIBDIR"
+            VAL=${opt:9}
+            ;;
         --with-*)
         --with-*)
             KEY="WITH_${opt:7}"
             KEY="WITH_${opt:7}"
             ;;
             ;;