]>
Commit | Line | Data |
---|---|---|
6c1bf004 JB |
1 | --- fdutils-5.5/doc/Makefile.in.orig 2008-02-09 15:25:18.520448000 +0100 |
2 | +++ fdutils-5.5/doc/Makefile.in 2008-02-09 15:42:44.432051695 +0100 | |
3 | @@ -79,51 +79,51 @@ Fdutils.texi: $(TEXISRC) texi-linearize | |
4 | ||
5 | # Don't cd, to avoid breaking install-sh references. | |
6 | install-info: info | |
7 | - $(top_srcdir)/mkinstalldirs $(infodir) | |
8 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) | |
9 | if test -f fdutils.info; then \ | |
10 | for i in fdutils.info*; do \ | |
11 | - $(INSTALL_DATA) $$i $(infodir)/$$i; \ | |
12 | + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ | |
13 | done; \ | |
14 | else \ | |
15 | for i in $(srcdir)/fdutils.info*; do \ | |
16 | - $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ | |
17 | + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ | |
18 | done; \ | |
19 | fi; \ | |
20 | if [ -n "$(INSTALL_INFO)" ] ; then \ | |
21 | - if [ -f $(infodir)/dir.info ] ; then \ | |
22 | - $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \ | |
23 | + if [ -f $(DESTDIR)$(infodir)/dir.info ] ; then \ | |
24 | + $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \ | |
25 | fi; \ | |
26 | if [ -f $(infodir)/dir ] ; then \ | |
27 | - $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \ | |
28 | + $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \ | |
29 | fi; \ | |
30 | fi | |
31 | ||
32 | ||
33 | ||
34 | install-man: | |
35 | - $(top_srcdir)/mkinstalldirs $(mandir1) | |
36 | - $(top_srcdir)/mkinstalldirs $(mandir4) | |
37 | - $(top_srcdir)/mkinstalldirs $(mandir8) | |
38 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir1) | |
39 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir4) | |
40 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir8) | |
41 | for i in $(MANPAGES1); do \ | |
42 | - install -c -m $(MANPERM) -o $(UID) -g $(GID) \ | |
43 | - $(srcdir)/$$i $(mandir1)/$$i; \ | |
44 | + install -c -m $(MANPERM) \ | |
45 | + $(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \ | |
46 | done | |
47 | ||
48 | for i in $(MANPAGES4); do \ | |
49 | - install -c -m $(MANPERM) -o $(UID) -g $(GID) \ | |
50 | - $(srcdir)/$$i $(mandir4)/$$i; \ | |
51 | + install -c -m $(MANPERM) \ | |
52 | + $(srcdir)/$$i $(DESTDIR)$(mandir4)/$$i; \ | |
53 | done | |
54 | ||
55 | # for i in $(MANPAGES8); do \ | |
56 | -# install -c -m $(MANPERM) -o $(UID) -g $(GID) \ | |
57 | -# $(srcdir)/$$i $(mandir8)/$$i; \ | |
58 | +# install -c -m $(MANPERM) \ | |
59 | +# $(srcdir)/$$i $(DESTDIR)$(mandir8)/$$i; \ | |
60 | # done | |
61 | ||
62 | - ( cd $(mandir1); \ | |
63 | - ln -sf fdmount.1 $(mandir1)/fdumount.1; \ | |
64 | - ln -sf fdmount.1 $(mandir1)/fdlist.1; \ | |
65 | - ln -sf fdmount.1 $(mandir1)/fdmountd.1; \ | |
66 | - ln -sf xdfcopy.1 $(mandir1)/xdfformat.1 \ | |
67 | + ( cd $(DESTDIR)$(mandir1); \ | |
68 | + echo '.so fdmount.1' > fdumount.1; \ | |
69 | + echo '.so fdmount.1' > fdlist.1; \ | |
70 | + echo '.so fdmount.1' > fdmountd.1; \ | |
71 | + echo '.so xdfcopy.1' > xdfformat.1 \ | |
72 | ) | |
73 | ||
74 | install-zman: | |
75 | --- fdutils-5.5/src/Makefile.in.orig 2002-11-21 08:23:06.000000000 +0100 | |
76 | +++ fdutils-5.5/src/Makefile.in 2008-02-09 15:43:41.115281887 +0100 | |
77 | @@ -111,32 +111,29 @@ spotless: clean | |
78 | diskseek diskd_old setfdprm xdfcopy fdmount 2>/dev/null | |
79 | ||
80 | install: install-bin install-conf | |
81 | - @grep -q '^floppy:' /etc/group \ | |
82 | - || echo 'Add a group "floppy" to /etc/group.' | |
83 | ||
84 | ||
85 | install-conf: | |
86 | - $(top_srcdir)/mkinstalldirs $(syconfdir) | |
87 | - if [ ! -f $(sysconfdir)/mediaprm ] ; then \ | |
88 | - cp $(srcdir)/mediaprm $(sysconfdir) ; \ | |
89 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(syconfdir) | |
90 | + if [ ! -f $(DESTDIR)$(sysconfdir)/mediaprm ] ; then \ | |
91 | + cp $(srcdir)/mediaprm $(DESTDIR)$(sysconfdir) ; \ | |
92 | fi | |
93 | ||
94 | install-bin: all | |
95 | - $(top_srcdir)/mkinstalldirs $(bindir) | |
96 | - $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir) | |
97 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir) | |
98 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir) | |
99 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir) | |
100 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir) | |
101 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir) | |
102 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir) | |
103 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir) | |
104 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir) | |
105 | - $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir) | |
106 | - $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir) | |
107 | - $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount | |
108 | - ( cd $(bindir); \ | |
109 | - ln -sf xdfcopy $(bindir)/xdfformat; \ | |
110 | - ln -sf fdmount $(bindir)/fdumount; \ | |
111 | - ln -sf fdmount $(bindir)/fdlist; \ | |
112 | - ln -sf fdmount $(bindir)/fdmountd ) | |
113 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | |
114 | + $(INSTALL) -c -m $(PERM) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir) | |
115 | + $(INSTALL) -c -m $(PERM) diskd $(DESTDIR)$(bindir) | |
116 | + $(INSTALL) -c -m $(PERM) diskseekd $(DESTDIR)$(bindir) | |
117 | + $(INSTALL) -c -m $(PERM) floppycontrol $(DESTDIR)$(bindir) | |
118 | + $(INSTALL) -c -m $(PERM) floppymeter $(DESTDIR)$(bindir) | |
119 | + $(INSTALL) -c -m $(PERM) getfdprm $(DESTDIR)$(bindir) | |
120 | + $(INSTALL) -c -m $(PERM) setfdprm $(DESTDIR)$(bindir) | |
121 | + $(INSTALL) -c -m $(PERM) fdrawcmd $(DESTDIR)$(bindir) | |
122 | + $(INSTALL) -c -m $(PERM) superformat $(DESTDIR)$(bindir) | |
123 | + $(INSTALL) -c -m $(PERM) xdfcopy $(DESTDIR)$(bindir) | |
124 | + $(INSTALL) -c -m $(PERM) fdmount $(DESTDIR)$(bindir) | |
125 | + ( cd $(DESTDIR)$(bindir); \ | |
126 | + ln -sf xdfcopy xdfformat; \ | |
127 | + ln -sf fdmount fdumount; \ | |
128 | + ln -sf fdmount fdlist; \ | |
129 | + ln -sf fdmount fdmountd ) |