Lines 1-33
Link Here
|
1 |
--- Makefile.orig Sun Nov 4 20:48:12 2001 |
1 |
--- Makefile.orig 2008-05-22 14:14:08 UTC |
2 |
+++ Makefile Sun Nov 4 20:49:08 2001 |
2 |
+++ Makefile |
3 |
@@ -25,12 +25,12 @@ |
3 |
@@ -24,31 +24,31 @@ |
|
|
4 |
# SUCH DAMAGE. |
4 |
# |
5 |
# |
5 |
# DHIS(c) Dynamic Host Information System Release 5.1 |
|
|
6 |
|
6 |
|
7 |
-CC=gcc |
7 |
-CC=gcc |
8 |
-CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK |
8 |
+CC ?= ${CC} |
9 |
-LFLAGS=-L/usr/local/lib |
9 |
|
10 |
+CC?=gcc |
10 |
-MYSQL_INCLUDE= -I/usr/local/include/mysql -I/usr/local/mysql/include \ |
11 |
+#CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK |
11 |
- -I/usr/local/mysql/include/mysql |
12 |
+#LDFLAGS=-L/usr/local/lib |
12 |
+MYSQL_INCLUDE= -I${PREFIX}/include/mysql -I${PREFIX}/mysql/include \ |
|
|
13 |
+ -I${PREFIX}/mysql/include/mysql |
14 |
|
15 |
-MYSQL_LIBDIR= -L/usr/local/lib/mysql -L/usr/local/mysql/lib \ |
16 |
- -L/usr/local/mysql/lib/mysql |
17 |
+MYSQL_LIBDIR= -L${PREFIX}/lib/mysql -L${PREFIX}/mysql/lib \ |
18 |
+ -L${PREFIX}/mysql/lib/mysql |
19 |
|
20 |
-WFLAGS=-Wall -Wstrict-prototypes -Wpointer-arith \ |
21 |
- -Wno-sign-compare -Wno-traditional -Wreturn-type -Wswitch -Wshadow \ |
22 |
+WFLAGS += -Wall -Wstrict-prototypes -Wpointer-arith \ |
23 |
+ -Wno-sign-compare -Wreturn-type -Wswitch -Wshadow \ |
24 |
-Wwrite-strings -Wextra -funsigned-char |
25 |
|
26 |
# Possible CFLAGS: -g -O3 -DDONT_FORK |
27 |
# |
28 |
|
29 |
-CFLAGS= -O3 $(WFLAGS) -I. -I/usr/local/include # $(MYSQL_INCLUDE) -DWITH_MYSQL=1 |
30 |
-LFLAGS= -L/usr/local/lib # $(MYSQL_LIBDIR) |
31 |
+CFLAGS= $(WFLAGS) -I. -I${PREFIX}/include |
32 |
+LDFLAGS= -L${PREFIX}/lib |
33 |
|
34 |
# For System V (Solaris) add -lnsl and -lsocket |
35 |
# For MySQL support add -lmysqlclient |
36 |
LIBS=-lgmp # -lmysqlclient #-lnsl -lsocket |
37 |
|
38 |
-INSTALLBIN=/usr/local/sbin |
39 |
-INSTALLCONF=/usr/local/etc |
40 |
-INSTALLRC=/usr/local/etc/rc.d |
41 |
+INSTALLBIN=${PREFIX}/sbin |
42 |
+INSTALLCONF=${PREFIX}/etc |
43 |
+INSTALLRC=${PREFIX}/etc/rc.d |
44 |
LOGDIR=/var/log/dhis |
45 |
PIDDIR=/var/run/dhis |
13 |
CP=cp |
46 |
CP=cp |
|
|
47 |
@@ -66,10 +66,10 @@ RM=rm -f |
48 |
all: dhisd dhisgenkeys |
14 |
|
49 |
|
15 |
-INSTALLDIR=/etc/dhis/bin |
50 |
dhisd: $(OBJS) main.o |
16 |
+INSTALLDIR=__PREFIX__/sbin |
51 |
- $(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS) main.o |
17 |
MODE=700 |
52 |
+ $(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS) main.o |
18 |
OWNER=root |
|
|
19 |
MKDIR=mkdir -p |
20 |
@@ -46,11 +46,11 @@ |
21 |
all: dhisd genkeys |
22 |
|
53 |
|
23 |
dhisd: $(OBJS) |
54 |
dhisgenkeys: qrc.o genkeys.o |
24 |
- $(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS) |
55 |
- $(CC) $(LFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o |
25 |
+ $(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS) |
56 |
+ $(CC) $(LDFLAGS) -o dhisgenkeys qrc.o $(LIBS) genkeys.o |
26 |
strip dhisd |
|
|
27 |
|
57 |
|
28 |
genkeys: |
58 |
main.o: main.c |
29 |
- $(CC) $(CFLAGS) $(LFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp |
59 |
$(CC) $(CFLAGS) -c main.c |
30 |
+ $(CC) $(CFLAGS) $(LDFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp |
60 |
@@ -84,18 +84,12 @@ install: dhisd dhisgenkeys |
|
|
61 |
$(MKDIR) $(PIDDIR) |
62 |
$(CP) dhisd $(INSTALLBIN) |
63 |
$(CP) dhisgenkeys $(INSTALLBIN) |
64 |
- $(CHOWN) dhis $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR) |
65 |
- $(CHGRP) dhis $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR) |
66 |
- $(CHMOD) 770 $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR) |
67 |
+ $(CHMOD) 750 $(INSTALLBIN)/dhisd $(INSTALLBIN)/dhisgenkeys $(LOGDIR) $(PIDDIR) |
68 |
$(CHMOD) u+s $(INSTALLBIN)/dhisd |
69 |
$(CP) dhis.db.sample dhisd.conf.sample $(INSTALLCONF) |
70 |
- $(CHOWN) dhis $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample |
71 |
- $(CHGRP) dhis $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample |
72 |
$(CHMOD) 640 $(INSTALLCONF)/dhis.db.sample $(INSTALLCONF)/dhisd.conf.sample |
73 |
$(CP) dhisd.rc $(INSTALLRC)/dhisd |
74 |
- $(CHOWN) dhis $(INSTALLRC)/dhisd |
75 |
- $(CHGRP) dhis $(INSTALLRC)/dhisd |
76 |
- $(CHMOD) 755 $(INSTALLRC)/dhisd |
77 |
+ $(CHMOD) 555 $(INSTALLRC)/dhisd |
31 |
|
78 |
|
32 |
install: dhisd genkeys |
79 |
clean: |
33 |
$(MKDIR) $(INSTALLDIR) |
80 |
$(RM) dhisgenkeys *.core core dhisd *.o *~ |