2008-07-05 13:20:48 +00:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2007-02-26 22:01:03 +00:00
|
|
|
@@ -20,7 +20,7 @@
|
2009-08-09 10:33:55 +00:00
|
|
|
# $Id: Makefile 312 2008-06-15 18:09:42Z Joerg Mayer $
|
2006-08-11 17:03:24 +00:00
|
|
|
|
|
|
|
|
DESTDIR=
|
|
|
|
|
-PREFIX=/usr/local
|
|
|
|
|
+PREFIX=/usr
|
|
|
|
|
ETCDIR=/etc/vpnc
|
2007-02-26 22:01:03 +00:00
|
|
|
BINDIR=$(PREFIX)/bin
|
2006-08-11 17:03:24 +00:00
|
|
|
SBINDIR=$(PREFIX)/sbin
|
2009-08-09 10:33:55 +00:00
|
|
|
@@ -51,14 +51,11 @@ RELEASE_VERSION := $(shell cat VERSION)
|
2008-07-05 13:20:48 +00:00
|
|
|
#OPENSSLLIBS = -lcrypto
|
2006-08-11 17:03:24 +00:00
|
|
|
|
|
|
|
|
CC=gcc
|
2008-07-05 13:20:48 +00:00
|
|
|
-CFLAGS ?= -O3 -g
|
|
|
|
|
-CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
2007-02-26 22:01:03 +00:00
|
|
|
-CFLAGS += $(shell libgcrypt-config --cflags)
|
2008-07-05 13:20:48 +00:00
|
|
|
+CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"'
|
|
|
|
|
CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
|
|
|
|
|
-LDFLAGS ?= -g
|
|
|
|
|
-LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
|
2007-02-26 22:01:03 +00:00
|
|
|
+LDFLAGS = -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error
|
2006-08-11 17:03:24 +00:00
|
|
|
|
|
|
|
|
-ifeq ($(shell uname -s), SunOS)
|
|
|
|
|
+ifeq ($(OS), SunOS)
|
|
|
|
|
LDFLAGS += -lnsl -lresolv -lsocket
|
2007-02-26 22:01:03 +00:00
|
|
|
endif
|
2008-07-05 13:20:48 +00:00
|
|
|
ifneq (,$(findstring Apple,$(shell $(CC) --version)))
|
