aboutsummaryrefslogtreecommitdiffstats
path: root/mail/metamail/files/patch-Makefile
blob: 5b1c63ff202ed1767436a281ffc70037cb781c1f (plain) (blame)
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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
--- Makefile.orig   1994-01-26 18:32:33.000000000 +0100
+++ Makefile    2013-05-27 11:38:13.565381504 +0200
@@ -26,7 +26,7 @@
 CP = cp
 
 # How to compile C programs
-CC = cc
+#CC = cc
 
 # You may also want to change the CFLAGS variable, which will be passed on 
 # to all subdirectories.    If you do that, the changes will only work right if you
@@ -38,7 +38,7 @@
 
 STATICFLAG=FOOBAR${HOST_ARCH}
 
-CFLAGS = -g -I.  ${$(STATICFLAG)} 
+CFLAGS += -I.  ${$(STATICFLAG)}
 # The following is better if you want to make sure you run with SYSV defined
 # CFLAGS = -g -I.  ${$(STATICFLAG)}  -DSYSV
 # Also, for SGI Irix, compile in K&R mode
@@ -49,9 +49,9 @@
 # LDLIBS variable.
 #
 # For Sun and BSD systems, the following should work...
-LDLIBS =
+# LDLIBS =
 # On BSD 4.4 systems, you will need the following
-# LDLIBS = -lcompat
+LDLIBS = -s -lcompat
 # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
 # LDLIBS = -lsun -lc_s
 # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
@@ -72,10 +72,10 @@
 #  install -s -c $(LOCALBINDIR) $$file
 #
 #INSTALL = cp
-INSTALL = install -c -s
+INSTALL = install -c
 
 # Root of installation tree
-INSTROOT = /usr/local
+INSTROOT = ${PREFIX}
 #
 # This is where binaries should be copied
 LOCALBINDIR = ${INSTROOT}/bin
@@ -96,9 +96,9 @@
 # This helps with the "for" constructs below on some platforms:
 SHELL=/bin/sh
 
-install: basics
+install: install-all
 
-basics::
+all basics::
    (cd metamail ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"  LDLIBS="${LDLIBS}")
    -${RM} bin/metamail
    (cd bin; ${LN} ../metamail/metamail metamail)
@@ -117,7 +117,7 @@
    (cd bin; ${LN} ../richmail/richtext richtext)
    -${RM} bin/richtoatk
    (cd bin; ${LN} ../richmail/richtoatk richtoatk)
-   (cd fonts ; $(MAKE)  CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
+   (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}")
    -${RM} bin/shownonascii
    (cd bin; ${LN} ../fonts/shownonascii shownonascii)
    -${RM} bin/mailto-hebrew
@@ -145,10 +145,11 @@
        echo "installing man page $$target";\
        ${CP} $$file $$target;      \
    done)
-   @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old
+   @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old"
    -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
    @echo "installing file $(MAILCAPDIR)/mailcap"
    ${CP} mailcap $(MAILCAPDIR)
+   (cd fonts ; $(MAKE) PREFIX=${PREFIX} CONFIGDIR=../${CONFIGDIR}  CFLAGS="${CFLAGS}" CC="${CC}"   LDLIBS="${LDLIBS}" FONTSUFFIX="${FONTSUFFIX}" install)
 
 uninstall-all:
    @(cd bin;               \