mirror of
				https://github.com/rofl0r/proxychains-ng.git
				synced 2025-11-04 00:56:03 +00:00 
			
		
		
		
	use musl's install.sh rather than doing workarounds for BSD install
This commit is contained in:
		
							
								
								
									
										25
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								Makefile
									
									
									
									
									
								
							@@ -33,7 +33,7 @@ RANLIB  = $(CROSS_COMPILE)ranlib
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
LDSO_SUFFIX = so
 | 
					LDSO_SUFFIX = so
 | 
				
			||||||
LD_SET_SONAME = -Wl,-soname=
 | 
					LD_SET_SONAME = -Wl,-soname=
 | 
				
			||||||
INSTALL_FLAGS = -D -m
 | 
					INSTALL = ./tools/install.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
 | 
					LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -41,6 +41,7 @@ SHARED_LIBS = $(LDSO_PATHNAME)
 | 
				
			|||||||
ALL_LIBS = $(SHARED_LIBS)
 | 
					ALL_LIBS = $(SHARED_LIBS)
 | 
				
			||||||
PXCHAINS = proxychains4
 | 
					PXCHAINS = proxychains4
 | 
				
			||||||
ALL_TOOLS = $(PXCHAINS)
 | 
					ALL_TOOLS = $(PXCHAINS)
 | 
				
			||||||
 | 
					ALL_CONFIGS = src/proxychains.conf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-include config.mak
 | 
					-include config.mak
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -50,14 +51,20 @@ CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDLL_NAME=\"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
all: $(ALL_LIBS) $(ALL_TOOLS)
 | 
					all: $(ALL_LIBS) $(ALL_TOOLS)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install-config: src/proxychains.conf
 | 
					install: install-libs install-tools
 | 
				
			||||||
	install -d $(DESTDIR)$(sysconfdir)
 | 
					 | 
				
			||||||
	install $(INSTALL_FLAGS) 644 src/proxychains.conf $(DESTDIR)$(sysconfdir)/
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
install: $(ALL_LIBS) $(ALL_TOOLS)
 | 
					$(DESTDIR)$(bindir)/%: %
 | 
				
			||||||
	install -d $(DESTDIR)$(bindir)/ $(DESTDIR)$(libdir)/
 | 
						$(INSTALL) -D -m 755 $< $@
 | 
				
			||||||
	install $(INSTALL_FLAGS) 755 $(ALL_TOOLS) $(DESTDIR)$(bindir)/
 | 
					
 | 
				
			||||||
	install $(INSTALL_FLAGS) 644 $(ALL_LIBS) $(DESTDIR)$(libdir)/
 | 
					$(DESTDIR)$(libdir)/%: %
 | 
				
			||||||
 | 
						$(INSTALL) -D -m 644 $< $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					$(DESTDIR)$(sysconfdir)/%: %
 | 
				
			||||||
 | 
						$(INSTALL) -D -m 644 $< $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					install-libs: $(ALL_LIBS:%=$(DESTDIR)$(libdir)/%)
 | 
				
			||||||
 | 
					install-tools: $(ALL_TOOLS:%=$(DESTDIR)$(bindir)/%)
 | 
				
			||||||
 | 
					install-config: $(ALL_CONFIGS:src/%=$(DESTDIR)$(sysconfdir)/%)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	rm -f $(ALL_LIBS)
 | 
						rm -f $(ALL_LIBS)
 | 
				
			||||||
@@ -80,4 +87,4 @@ $(ALL_TOOLS): $(OBJS)
 | 
				
			|||||||
	$(CC) src/main.o src/common.o -o $(PXCHAINS)
 | 
						$(CC) src/main.o src/common.o -o $(PXCHAINS)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: all clean install install-config
 | 
					.PHONY: all clean install install-config install-libs install-tools
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@@ -99,11 +99,9 @@ if ismac ; then
 | 
				
			|||||||
		echo LDFLAGS+=-arch i386 -arch x86_64>>config.mak
 | 
							echo LDFLAGS+=-arch i386 -arch x86_64>>config.mak
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
	echo LD_SET_SONAME=-Wl,-install_name,>>config.mak
 | 
						echo LD_SET_SONAME=-Wl,-install_name,>>config.mak
 | 
				
			||||||
	echo INSTALL_FLAGS=-m>>config.mak
 | 
					 | 
				
			||||||
elif isbsd ; then
 | 
					elif isbsd ; then
 | 
				
			||||||
	echo LIBDL=>>config.mak
 | 
						echo LIBDL=>>config.mak
 | 
				
			||||||
	echo "CFLAGS+=-DIS_BSD">>config.mak
 | 
						echo "CFLAGS+=-DIS_BSD">>config.mak
 | 
				
			||||||
	echo INSTALL_FLAGS=-m>>config.mak
 | 
					 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Done, now run make && make install"
 | 
					echo "Done, now run make && make install"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										64
									
								
								tools/install.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										64
									
								
								tools/install.sh
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,64 @@
 | 
				
			|||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This is an actually-safe install command which installs the new
 | 
				
			||||||
 | 
					# file atomically in the new location, rather than overwriting
 | 
				
			||||||
 | 
					# existing files.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					usage() {
 | 
				
			||||||
 | 
					printf "usage: %s [-D] [-l] [-m mode] src dest\n" "$0" 1>&2
 | 
				
			||||||
 | 
					exit 1
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					mkdirp=
 | 
				
			||||||
 | 
					symlink=
 | 
				
			||||||
 | 
					mode=755
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					while getopts Dlm: name ; do
 | 
				
			||||||
 | 
					case "$name" in
 | 
				
			||||||
 | 
					D) mkdirp=yes ;;
 | 
				
			||||||
 | 
					l) symlink=yes ;;
 | 
				
			||||||
 | 
					m) mode=$OPTARG ;;
 | 
				
			||||||
 | 
					?) usage ;;
 | 
				
			||||||
 | 
					esac
 | 
				
			||||||
 | 
					done
 | 
				
			||||||
 | 
					shift $(($OPTIND - 1))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					test "$#" -eq 2 || usage
 | 
				
			||||||
 | 
					src=$1
 | 
				
			||||||
 | 
					dst=$2
 | 
				
			||||||
 | 
					tmp="$dst.tmp.$$"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					case "$dst" in
 | 
				
			||||||
 | 
					*/) printf "%s: %s ends in /\n", "$0" "$dst" 1>&2 ; exit 1 ;;
 | 
				
			||||||
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set -C
 | 
				
			||||||
 | 
					set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if test "$mkdirp" ; then
 | 
				
			||||||
 | 
					umask 022
 | 
				
			||||||
 | 
					case "$2" in
 | 
				
			||||||
 | 
					*/*) mkdir -p "${dst%/*}" ;;
 | 
				
			||||||
 | 
					esac
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					umask 077
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if test "$symlink" ; then
 | 
				
			||||||
 | 
					ln -s "$1" "$tmp"
 | 
				
			||||||
 | 
					else
 | 
				
			||||||
 | 
					cat < "$1" > "$tmp"
 | 
				
			||||||
 | 
					chmod "$mode" "$tmp"
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					mv -f "$tmp" "$2"
 | 
				
			||||||
 | 
					test -d "$2" && {
 | 
				
			||||||
 | 
					rm -f "$2/$tmp"
 | 
				
			||||||
 | 
					printf "%s: %s is a directory\n" "$0" "$dst" 1>&2
 | 
				
			||||||
 | 
					exit 1
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					exit 0
 | 
				
			||||||
		Reference in New Issue
	
	Block a user