summaryrefslogtreecommitdiff
blob: 92d96147bb72e5501c4ab2b342a0a4fc877563d3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
diff -ur mdsplib-0.11.orig/Makefile mdsplib-0.11/Makefile
--- mdsplib-0.11.orig/Makefile	2003-12-10 21:56:23.000000000 +0200
+++ mdsplib-0.11/Makefile	2009-08-06 13:33:03.000000000 +0300
@@ -1,5 +1,6 @@
-CC = gcc
-CFLAGS = -O3
+AR ?= ar
+CC ?= gcc
+RANLIB ?= ranlib
 LIBS = 
 
 library: libmetar.a
@@ -7,11 +8,11 @@
 all: dmetar library
 
 libmetar.a: src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
-	ar ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
-	ranlib libmetar.a
+	$(AR) ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
+	$(RANLIB) libmetar.a
 
 dmetar: src/drvmetar.o libmetar.a
-	$(CC) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS)
 
 src/antoi.o: src/antoi.c src/local.h
 	$(CC) $(CFLAGS) -c src/antoi.c -o src/antoi.o
@@ -48,5 +49,5 @@
 	chmod 0644 /usr/local/include/metar.h
 	cp libmetar.a /usr/local/lib/
 	chmod 0644 /usr/local/lib/libmetar.a
-	ranlib /usr/local/lib/libmetar.a
+	$(RANLIB) /usr/local/lib/libmetar.a
 
diff -ur mdsplib-0.11.orig/src/local.h mdsplib-0.11/src/local.h
--- mdsplib-0.11.orig/src/local.h	2003-12-10 23:30:56.000000000 +0200
+++ mdsplib-0.11/src/local.h	2009-08-06 13:27:03.000000000 +0300
@@ -1175,7 +1175,7 @@
 char *strupr(char *);
 char *strlwr(char *);
 /* char *strdup(char *); */
-char *strndup(char *, int);
+/* char *strndup(char *, int); */
 int strcmpi(char *, char *);
  
 /* void *memccpy(void *, void *, int, unsigned); */