Merge rofl0r updates to bring both forks of proxychains to same base and to not diverge them more then they are now.

Merge branch 'master' of https://github.com/rofl0r/proxychains into rofl0r-master

Conflicts:
	Makefile
	src/core.c
	src/core.h
	src/libproxychains.c
	src/main.c

1 files changed, 13 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index c68f876..b4466de 100644
--- a/Makefile
+++ b/Makefile
@@ -24,26 +24,31 @@ PIC     = -fPIC
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
 
-LDSO_PATHNAME = libproxychains4.so
+LDSO_SUFFIX = so
+LD_SET_SONAME = -Wl,-soname=
+INSTALL_FLAGS = -D -m
+
+-include config.mak
+
+LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
 
 SHARED_LIBS = $(LDSO_PATHNAME)
 ALL_LIBS = $(SHARED_LIBS)
 PXCHAINS = proxychains4
 ALL_TOOLS = $(PXCHAINS)
 
--include config.mak
 
-CCFLAGS+=$(USER_CFLAGS)
-CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\"  -DINSTALL_PREFIX=\"$(prefix)\"
+CFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
+CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DINSTALL_PREFIX=\"$(prefix)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
 
 
 all: $(ALL_LIBS) $(ALL_TOOLS)
 
 #install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(DESTDIR)$(LDSO_PATHNAME)
 install: 
-	install -D -m 755 $(ALL_TOOLS) $(bindir)/
-	install -D -m 644 $(ALL_LIBS) $(libdir)/
-	install -D -m 644 src/proxychains.conf $(confdir)
+	install $(INSTALL_FLAGS) 755 $(ALL_TOOLS) $(bindir)/
+	install $(INSTALL_FLAGS) 644 $(ALL_LIBS) $(libdir)/
+	install $(INSTALL_FLAGS) 644 src/proxychains.conf $(prefix)/etc/
 
 clean:
 	rm -f $(ALL_LIBS)
@@ -54,7 +59,7 @@ clean:
 	$(CC) $(CCFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
 
 $(LDSO_PATHNAME): $(LOBJS)
-	$(CC) $(LDFLAGS) -Wl,-soname=$(LDSO_PATHNAME) -o $@ $(LOBJS)
+	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
 
 $(ALL_TOOLS): $(OBJS)
 	$(CC) src/main.o -o $(PXCHAINS)