$NetBSD$ Permit compile and link flags to be passed as well as install directory --- src/makefiles/linux_64bit.mak.orig 2019-02-28 11:05:23.000000000 +0000 +++ src/makefiles/linux_64bit.mak @@ -62,19 +62,24 @@ #CC=gcc -OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64 +OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64 -OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz +OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64 +OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64 -OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz +OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -INSTALL_BINDIR=/usr/bin/ -INSTALL_VPNSERVER_DIR=/usr/vpnserver/ -INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/ -INSTALL_VPNCLIENT_DIR=/usr/vpnclient/ -INSTALL_VPNCMD_DIR=/usr/vpncmd/ +BINDIR=$(PREFIX)/bin/ +INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR) +VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/ +INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR) +VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/ +INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR) +VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/ +INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR) +VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/ +INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR) ifeq ($(DEBUG),YES) OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG) @@ -433,7 +438,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2 cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver - echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver + echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver chmod 755 $(INSTALL_BINDIR)vpnserver @@ -442,7 +447,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2 cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge - echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge + echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge chmod 755 $(INSTALL_BINDIR)vpnbridge @@ -451,7 +456,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2 cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient - echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient + echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient chmod 755 $(INSTALL_BINDIR)vpnclient @@ -460,7 +465,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2 cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd - echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd + echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd chmod 755 $(INSTALL_BINDIR)vpncmd