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
80
81
82
83
84
|
--- Makefile.common.orig Tue Apr 4 04:54:35 2000
+++ Makefile.common Sat Apr 8 12:00:00 2000
@@ -47,7 +47,7 @@
$(CC) $(CFLAGS) -Wno-implicit -c -o $@ $<
$(MERGENAME): $(MERGENAME).o $(MERGE_OBJECTS) $(NETPBMLIBS)
- $(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLIBS)
+ $(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLD)
# Before Netpbm 8.4, we did hard links instead of symbolic. A user
# requested symbolic, and I couldn't see a reason for hard (original reason
@@ -56,31 +56,27 @@
install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
ifneq ($(MERGENAME)x,x)
- cp $(MERGENAME) $(INSTALLBINARIES)
- strip $(INSTALLBINARIES)/$(MERGENAME)
+ ${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
for i in $(BINARIES) $(MERGE_ALIASES) ; \
- do ln -s $(MERGENAME) $$i ; \
+ do ln -sf $(MERGENAME) $$i ; \
done
endif
ifneq ($(NOMERGEBINARIES)x,x)
cd $(INSTALLBINARIES) ; rm -f $(NOMERGEBINARIES)
- cp $(NOMERGEBINARIES) $(INSTALLBINARIES)
- cd $(INSTALLBINARIES) ; strip $(NOMERGEBINARIES)
+ ${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
endif
.PHONY: install.bin.common
install.bin.common: $(BINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
- cp $(BINARIES) $(INSTALLBINARIES)
- cd $(INSTALLBINARIES) ; strip $(BINARIES)
+ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES)
.PHONY: install.script
install.script: $(SCRIPTS)
ifneq ($(SCRIPTS)x,x)
cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
- cp $(SCRIPTS) $(INSTALLSCRIPTS)
- cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
+ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
endif
.PHONY: install.man
@@ -111,13 +107,12 @@
# prefer not to "install" them, but just to access the Netpbm source
# directory when you compile your programs.
cd $(INSTALLHDRS) ; rm -f $(INTERFACE_HEADERS)
- cp $(INTERFACE_HEADERS) $(INSTALLHDRS)
+ ${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
-lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ).$(MIN)
- ln -sf lib$(LIBROOT).so.$(MAJ).$(MIN) $@
-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBLIBS)
- $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
- $(LIBOBJECTS) $(LIBLIBS) -lc
+lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
+ ln -sf lib$(LIBROOT).so.$(MAJ) $@
+lib$(LIBROOT).so.$(MAJ): lib$(LIBROOT).a $(LIBSOBJECTS) $(LIBLIBS)
+ $(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) $(LIBLIBS)
lib$(LIBROOT).a: $(LIBOBJECTS)
-rm -f $@
@@ -126,11 +121,11 @@
.PHONY: install.lib.common
-install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN)
- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
- cp $< $(INSTALLLIBS)
- cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so
- cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so.$(MAJ)
+install.lib.common: lib$(LIBROOT).a lib$(LIBROOT).so
+ cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).*
+ ${BSD_INSTALL_DATA} lib$(LIBROOT).a $(INSTALLLIBS)
+ ${BSD_INSTALL_DATA} lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)
+ ln -sf lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)/lib$(LIBROOT).so
.PHONY: dep
dep Makefile.depend:
|
