/[packages]/cauldron/aircrack-ng/pristine/SOURCES/aircrack-ng-1.1-makefile-fixes.patch
ViewVC logotype

Annotation of /cauldron/aircrack-ng/pristine/SOURCES/aircrack-ng-1.1-makefile-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1183 - (hide annotations) (download)
Sat Jan 8 20:42:42 2011 UTC (13 years, 1 month ago) by kharec
Original Path: cauldron/aircrack-ng/current/SOURCES/aircrack-ng-1.1-makefile-fixes.patch
File size: 4528 byte(s)
imported package aircrack-ng
1 kharec 1183 --- aircrack-ng-1.1/common.mak.make_makeup~ 2010-02-13 23:32:28.000000000 +0100
2     +++ aircrack-ng-1.1/common.mak 2010-08-05 03:23:29.247432868 +0200
3     @@ -31,16 +31,16 @@ COMMON_CFLAGS += -DCYGWIN
4     endif
5    
6     ifeq ($(SQLITE), true)
7     - COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
8     + COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP
9     else
10     ifeq ($(sqlite), true)
11     - COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
12     + COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP
13     else
14     ifeq ($(SQLITE), TRUE)
15     - COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
16     + COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP
17     else
18     ifeq ($(sqlite), TRUE)
19     - COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
20     + COMMON_CFLAGS += $(shell pkg-config --cflags sqlite3) -DHAVE_SQLITE -DHAVE_REGEXP
21     endif
22     endif
23     endif
24     @@ -66,15 +66,15 @@ AR = $(TOOL_PREFIX)ar
25     REVISION = $(shell $(AC_ROOT)/evalrev)
26     REVFLAGS = -D_REVISION=$(REVISION)
27    
28     -OPTFLAGS = -D_FILE_OFFSET_BITS=64
29     +OPTFLAGS = $(shell getconf LFS_CFLAGS)
30     CFLAGS ?= -g -W -Wall -Werror -O3
31     CFLAGS += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS)
32    
33     prefix = /usr/local
34     bindir = $(prefix)/bin
35     sbindir = $(prefix)/sbin
36     -mandir = $(prefix)/man/man1
37     +mandir = $(prefix)/man
38     datadir = $(prefix)/share
39     docdir = $(datadir)/doc/aircrack-ng
40     libdir = $(prefix)/lib
41     -etcdir = $(prefix)/etc/aircrack-ng
42     \ No newline at end of file
43     +etcdir = $(prefix)/etc/aircrack-ng
44     --- aircrack-ng-1.1/manpages/Makefile.make_makeup~ 2009-02-20 18:43:30.000000000 +0100
45     +++ aircrack-ng-1.1/manpages/Makefile 2010-08-05 03:19:56.167428259 +0200
46     @@ -47,13 +47,13 @@ all:
47     @echo Nothing to do
48    
49     install: uninstall
50     - install -d $(DESTDIR)$(mandir)
51     - install -m 644 $(MP_FILES) $(DESTDIR)$(mandir)
52     + install -d $(DESTDIR)$(mandir)/man1
53     + install -m 644 $(MP_FILES) $(DESTDIR)$(mandir)/man1
54    
55     uninstall:
56     - @-$(foreach CUR_MP,$(MP_FILES), rm -f $(DESTDIR)$(mandir)/$(CUR_MP); echo rm -f $(DESTDIR)$(mandir)/$(CUR_MP); )
57     - -rm -f $(DESTDIR)$(mandir)/airolib-ng.1
58     - -rm -f $(DESTDIR)$(mandir)/wesside-ng.1
59     - -rm -f $(DESTDIR)$(mandir)/tkiptun-ng.1
60     - -rm -f $(DESTDIR)$(mandir)/buddy-ng.1
61     - -rm -f $(DESTDIR)$(mandir)/easside-ng.1
62     + @-$(foreach CUR_MP,$(MP_FILES), rm -f $(DESTDIR)$(mandir)/man1/$(CUR_MP); echo rm -f $(DESTDIR)$(mandir)/man1/$(CUR_MP); )
63     + -rm -f $(DESTDIR)$(mandir)/man1/airolib-ng.1
64     + -rm -f $(DESTDIR)$(mandir)/man1/wesside-ng.1
65     + -rm -f $(DESTDIR)$(mandir)/man1/tkiptun-ng.1
66     + -rm -f $(DESTDIR)$(mandir)/man1/buddy-ng.1
67     + -rm -f $(DESTDIR)$(mandir)/man1/easside-ng.1
68     --- aircrack-ng-1.1/scripts/airgraph-ng/common.mak.make_makeup~ 2009-02-10 06:05:30.000000000 +0100
69     +++ aircrack-ng-1.1/scripts/airgraph-ng/common.mak 2010-08-05 03:19:56.168433614 +0200
70     @@ -1,6 +1,6 @@
71     prefix = /usr/local
72     bindir = $(prefix)/bin
73     -mandir = $(prefix)/man/man1
74     +mandir = $(prefix)/man
75     datadir = $(prefix)/share
76     docdir = $(datadir)/doc/airgraph-ng
77     libdir = $(prefix)/lib
78     --- aircrack-ng-1.1/src/Makefile.make_makeup~ 2010-02-13 23:32:28.000000000 +0100
79     +++ aircrack-ng-1.1/src/Makefile 2010-08-05 03:21:38.991315747 +0200
80     @@ -96,19 +96,19 @@ LIBS += -liphlpapi -lsetupapi -luuid
81     endif
82     LIBOSD = $(OSD)/lib$(OSD).a
83    
84     -LIBSSL = -lssl -lcrypto $(LDFLAGS)
85     +LIBSSL = $(shell pkg-config --libs openssl)
86     LIBSQL =
87     ifeq ($(SQLITE), true)
88     - LIBSQL = -L/usr/local/lib -lsqlite3
89     + LIBSQL = $(shell pkg-config --libs sqlite3)
90     else
91     ifeq ($(sqlite), true)
92     - LIBSQL = -L/usr/local/lib -lsqlite3
93     + LIBSQL = $(shell pkg-config --libs sqlite3)
94     else
95     ifeq ($(SQLITE), TRUE)
96     - LIBSQL = -L/usr/local/lib -lsqlite3
97     + LIBSQL = $(shell pkg-config --libs sqlite3)
98     else
99     ifeq ($(sqlite), TRUE)
100     - LIBSQL = -L/usr/local/lib -lsqlite3
101     + LIBSQL = $(shell pkg-config --libs sqlite3)
102     endif
103     endif
104     endif
105     @@ -179,7 +179,7 @@ makeivs-ng$(EXE): $(OBJS_MI)
106     $(CC) $(CFLAGS) $(OBJS_MI) -o $(@)
107    
108     airolib-ng$(EXE): $(OBJS_AL)
109     - $(CC) $(CFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
110     + $(CC) $(CFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) $(LIBSQL)
111    
112     airbase-ng$(EXE): $(OBJS_AB) $(LIBOSD)
113     $(CC) $(CFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread

  ViewVC Help
Powered by ViewVC 1.1.30