001-cross.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. --- a/Makefile
  2. +++ b/Makefile
  3. @@ -20,7 +20,7 @@
  4. # $Id: Makefile 539 2013-12-04 13:41:04Z Antonio Borneo $
  5. DESTDIR=
  6. -PREFIX=/usr/local
  7. +PREFIX=/usr
  8. ETCDIR=/etc/vpnc
  9. BINDIR=$(PREFIX)/bin
  10. SBINDIR=$(PREFIX)/sbin
  11. @@ -57,18 +57,15 @@ OBJS = $(addsuffix .o,$(basename $(SRCS)
  12. CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS)))
  13. BINOBJS = $(addsuffix .o,$(BINS))
  14. BINSRCS = $(addsuffix .c,$(BINS))
  15. -VERSION := $(shell sh mk-version)
  16. RELEASE_VERSION := $(shell cat VERSION)
  17. CC ?= gcc
  18. -CFLAGS ?= -O3 -g
  19. CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
  20. -CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
  21. +CFLAGS += -O3 -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) $(CRYPTO_CFLAGS)
  22. CPPFLAGS += -DVERSION=\"$(VERSION)\"
  23. -LDFLAGS ?= -g
  24. -LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
  25. +LIBS += -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error $(CRYPTO_LDADD)
  26. -ifeq ($(shell uname -s), SunOS)
  27. +ifeq ($(OS), SunOS)
  28. LIBS += -lnsl -lresolv -lsocket
  29. endif
  30. ifneq (,$(findstring Apple,$(shell $(CC) --version)))
  31. @@ -82,7 +79,7 @@ vpnc : $(OBJS) vpnc.o
  32. $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  33. vpnc.8 : vpnc.8.template makeman.pl vpnc
  34. - ./makeman.pl
  35. + touch vpnc.8
  36. cisco-decrypt : cisco-decrypt.o decrypt-utils.o
  37. $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)