diff -Nur vpnc-0.3.3/Makefile vpnc-0.3.3.patched/Makefile --- vpnc-0.3.3/Makefile 2005-05-01 22:30:35.000000000 +0200 +++ vpnc-0.3.3.patched/Makefile 2005-12-23 23:43:55.222055250 +0100 @@ -17,31 +17,32 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA DESTDIR= -PREFIX=/usr/local +PREFIX=/usr ETCDIR=/etc/vpnc SBINDIR=$(PREFIX)/sbin MANDIR=$(PREFIX)/share/man CC=gcc -CFLAGS=-W -Wall -O -g '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags) -LDFLAGS=-g $(shell libgcrypt-config --libs) +CFLAGS=-W -Wall -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"' +LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error -ifeq ($(shell uname -s), Linux) +OS=$(shell uname -s) +ifeq ($(OS), Linux) SYSDEP=sysdep-linux.o endif -ifeq ($(shell uname -s), FreeBSD) +ifeq ($(OS), FreeBSD) CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN SYSDEP=sysdep-bsd.o endif -ifeq ($(shell uname -s), NetBSD) +ifeq ($(OS), NetBSD) CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN SYSDEP=sysdep-bsd.o endif -ifeq ($(shell uname -s), OpenBSD) +ifeq ($(OS), OpenBSD) CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN -DNEED_IPLEN_FIX -DNEW_TUN SYSDEP=sysdep-bsd.o endif -ifeq ($(shell uname -s), SunOS) +ifeq ($(OS), SunOS) CFLAGS += -DNEED_IPLEN_FIX LDFLAGS += -lnsl -lresolv -lsocket SYSDEP=sysdep-svr4.o