|
Lines 1-7
Link Here
|
| 1 |
--- Makefile.orig Sun Feb 9 05:04:20 2003 |
1 |
--- Makefile.orig Sun Feb 9 05:04:20 2003 |
| 2 |
+++ Makefile Tue Jan 27 16:34:31 2004 |
2 |
+++ Makefile Tue Jan 27 16:34:31 2004 |
| 3 |
@@ -46,16 +46,18 @@ |
3 |
@@ -46,15 +46,17 @@ |
| 4 |
|
|
|
| 5 |
# To specify a different prefix, you can override this on the command line |
4 |
# To specify a different prefix, you can override this on the command line |
| 6 |
# make PREFIX=/opt/dockapps install |
5 |
# make PREFIX=/opt/dockapps install |
| 7 |
-PREFIX= /usr/local |
6 |
-PREFIX= /usr/local |
|
Lines 12-43
Link Here
|
| 12 |
-INSTALLBIN= install -m 555 |
11 |
-INSTALLBIN= install -m 555 |
| 13 |
-INSTALLMAN= install -m 444 |
12 |
-INSTALLMAN= install -m 444 |
| 14 |
-CC= gcc |
13 |
-CC= gcc |
| 15 |
-CFLAGS= -ansi -Wall -W -I/usr/X11R6/include -D_GNU_SOURCE |
14 |
-CFLAGS= -Wall -W -I/usr/X11R6/include -O |
| 16 |
+INSTALLBIN= $(INSTALL_PROGRAM) |
15 |
+INSTALLBIN= $(INSTALL_PROGRAM) |
| 17 |
+INSTALLMAN= $(INSTALL_MAN) |
16 |
+INSTALLMAN= $(INSTALL_MAN) |
| 18 |
+CC?= gcc |
17 |
+CC?= gcc |
| 19 |
+CFLAGS?= -ansi -Wall -W |
18 |
+CFLAGS?= -Wall -W |
| 20 |
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -D_GNU_SOURCE |
19 |
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include |
| 21 |
# The following line is what I use during development |
20 |
# The following line is what I use during development |
| 22 |
#CFLAGS:= $(CFLAGS) -Werror -g |
21 |
#CFLAGS:= $(CFLAGS) -Werror -g |
| 23 |
-LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl |
22 |
-LDFLAGS= -L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl |
| 24 |
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl |
23 |
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -lXpm -lXext -lX11 -lm -lcurl |
| 25 |
DOCS= wmget.1 |
24 |
DOCS= wmget.1 |
| 26 |
|
25 |
|
| 27 |
VERSION:= $(shell grep '\#define WMGET_VERSION ' wmget.h \ |
26 |
VERSION:= $(shell grep '\#define WMGET_VERSION ' wmget.h \ |
| 28 |
@@ -107,7 +109,7 @@ |
27 |
@@ -99,5 +101,5 @@ |
| 29 |
##### LIBRARY ########################################################## |
|
|
| 30 |
|
| 31 |
dockapplib: |
28 |
dockapplib: |
| 32 |
- make -C $(DALIBDIR) |
29 |
- make -C $(DALIBDIR) |
| 33 |
+ ${MAKE} -C $(DALIBDIR) |
30 |
+ ${MAKE} -C $(DALIBDIR) |
| 34 |
|
31 |
|
| 35 |
|
32 |
|
| 36 |
|
33 |
|
| 37 |
@@ -130,7 +132,7 @@ |
34 |
@@ -121,4 +123,4 @@ |
| 38 |
wmget.html |
|
|
| 39 |
sed -e '/^# DO NOT/q' < Makefile > Makefile.clean \ |
| 40 |
&& mv -f Makefile.clean Makefile |
| 41 |
- make -C dockapp clean |
35 |
- make -C dockapp clean |
| 42 |
+ ${MAKE} -C dockapp clean |
36 |
+ ${MAKE} -C dockapp clean |