Attachment #401712 for bug #547234




BUILDDIR =
CC = gcc

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 -pthread
DLFLAGS = -shared
DLSUFFICS = .ld.so
# -lpthreads may be reuqired on some platforms instead of -pthreads

include Makefile.inc

allplugins:
	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ;	cd ../.. ; done

DESTDIR		=
prefix		=
exec_prefix	= $(prefix)
man_prefix	= $(prefix)/usr/share

INSTALL		= /usr/bin/install
INSTALL_BIN	= $(INSTALL) -m 755

Lines 38-44 Link Here

(-)src/stringtable.c.orig (-1 / +1 lines)
38	/* 24 */ NULL,	38	/* 24 */ NULL,
39	#ifndef TPROXY_CONF	39	#ifndef TPROXY_CONF
40	#ifndef _WIN32	40	#ifndef _WIN32
41	/* 25 / (unsigned char )"/usr/local/etc/3proxy/3proxy.cfg",	41	/* 25 / (unsigned char )"/etc/3proxy/3proxy.cfg",
42	#else	42	#else
43	/* 25 / (unsigned char )"3proxy.cfg",	43	/* 25 / (unsigned char )"3proxy.cfg",
44	#endif	44	#endif

Return to bug 547234

Lines 11-21 Link Here

(-)Makefile.Linux.orig (-5 / +5 lines)
11	BUILDDIR =	11	BUILDDIR =
12	CC = gcc	12	CC = gcc
13		13
14	CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL	14	CFLAGS += -Wall -g -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
15	COUT = -o	15	COUT = -o
16	LN = gcc	16	LN = gcc
17	DCFLAGS = -fpic	17	DCFLAGS = -fpic
18	LDFLAGS = -Wall -O2 -pthread	18	LDFLAGS += -Wall -pthread
19	DLFLAGS = -shared	19	DLFLAGS = -shared
20	DLSUFFICS = .ld.so	20	DLSUFFICS = .ld.so
21	# -lpthreads may be reuqired on some platforms instead of -pthreads	21	# -lpthreads may be reuqired on some platforms instead of -pthreads
Lines 38-49 Link Here
38	include Makefile.inc	38	include Makefile.inc
39		39
40	allplugins:	40	allplugins:
41	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done	41	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done
42		42
43	DESTDIR =	43	DESTDIR =
44	prefix = /usr/local	44	prefix =
45	exec_prefix = $(prefix)	45	exec_prefix = $(prefix)
46	man_prefix = $(prefix)/share	46	man_prefix = $(prefix)/usr/share
47		47
48	INSTALL = /usr/bin/install	48	INSTALL = /usr/bin/install
49	INSTALL_BIN = $(INSTALL) -m 755	49	INSTALL_BIN = $(INSTALL) -m 755