[patch] fixed hardcoded CFLAGS, fixed hardcoded installation into a /usr/local

3proxy-0.7.1.2-gentoo.patch (text/plain), 1.50 KB, created by Yuri Tsimbaloff on 2015-04-20 23:43:14 UTC

--- Makefile.Linux.orig	2015-04-18 01:55:14.195955388 +0300
+++ Makefile.Linux	2015-04-21 02:30:16.835282128 +0300
@@ -11,11 +11,11 @@
 BUILDDIR =
 CC = gcc
 
-CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+CFLAGS += -Wall -g -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
 COUT = -o 
 LN = gcc
 DCFLAGS = -fpic
-LDFLAGS = -Wall -O2 -pthread
+LDFLAGS += -Wall -pthread
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 # -lpthreads may be reuqired on some platforms instead of -pthreads
@@ -38,12 +38,12 @@
 include Makefile.inc
 
 allplugins:
-	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
+	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ;	cd ../.. ; done
 
 DESTDIR		=
-prefix		= /usr/local
+prefix		=
 exec_prefix	= $(prefix)
-man_prefix	= $(prefix)/share
+man_prefix	= $(prefix)/usr/share
 
 INSTALL		= /usr/bin/install
 INSTALL_BIN	= $(INSTALL) -m 755
--- src/stringtable.c.orig	2015-04-21 02:23:10.895258697 +0300
+++ src/stringtable.c	2015-04-21 02:23:31.141926478 +0300
@@ -38,7 +38,7 @@
 /* 24 */	NULL,
 #ifndef TPROXY_CONF
 #ifndef _WIN32
-/* 25 */	(unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",
+/* 25 */	(unsigned char *)"/etc/3proxy/3proxy.cfg",
 #else
 /* 25 */	(unsigned char *)"3proxy.cfg",
 #endif