1 diff -Nur grace-5.1.9.orig/Makefile grace-5.1.9/Makefile
2 --- grace-5.1.9.orig/Makefile Sat Jun 22 13:40:18 2002
3 +++ grace-5.1.9/Makefile Sun Aug 11 01:09:39 2002
7 @set -e; for i in $(SUBDIRS); do (cd $$i; $(MAKE) install) || exit 1; done
8 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)
9 - @if test -f $(DESTDIR)$(GRACE_HOME)/gracerc; then \
10 - echo " $(DESTDIR)$(GRACE_HOME)/gracerc exists"; \
11 - echo " Installing only $(DESTDIR)$(GRACE_HOME)/gracerc.sample"; \
12 - $(INSTALL_DATA) gracerc $(DESTDIR)$(GRACE_HOME)/gracerc.sample; \
13 + $(MKINSTALLDIRS) $(DESTDIR)/etc/grace
14 + @if test -f $(DESTDIR)/etc/grace/gracerc; then \
15 + echo " $(DESTDIR)/etc/grace/gracerc exists"; \
16 + echo " Installing only $(DESTDIR)/etc/grace/gracerc.sample"; \
17 + $(INSTALL_DATA) gracerc $(DESTDIR)/etc/grace/gracerc.sample; \
19 - $(INSTALL_DATA) gracerc $(DESTDIR)$(GRACE_HOME); \
20 + $(INSTALL_DATA) gracerc $(DESTDIR)/etc/grace; \
22 - $(INSTALL_DATA) gracerc.user $(DESTDIR)$(GRACE_HOME)
23 + $(INSTALL_DATA) gracerc.user $(DESTDIR)/etc/grace
26 @set -e; for i in $(SUBDIRS); do (cd $$i; $(MAKE) tests) || exit 1; done
27 diff -Nur grace-5.1.9.orig/ac-tools/Make.conf.in grace-5.1.9/ac-tools/Make.conf.in
28 --- grace-5.1.9.orig/ac-tools/Make.conf.in Sun Feb 20 01:49:12 2000
29 +++ grace-5.1.9/ac-tools/Make.conf.in Sun Aug 11 01:10:17 2002
31 # Location of the Grace home
32 GRACE_HOME=@GRACE_HOME@
44 +INCLUDEDIR=@includedir@
49 # Relocatable that contains alloca()
52 diff -Nur grace-5.1.9.orig/auxiliary/Makefile grace-5.1.9/auxiliary/Makefile
53 --- grace-5.1.9.orig/auxiliary/Makefile Sat Jun 22 13:40:21 2002
54 +++ grace-5.1.9/auxiliary/Makefile Sun Aug 11 01:11:51 2002
56 $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS)
58 install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS)
59 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary
60 - for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/auxiliary; done
61 - for i in $(PROGRAMS); do $(INSTALL_PROGRAM) -s $$i $(DESTDIR)$(GRACE_HOME)/bin; done
62 - for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
63 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/auxiliary $(DESTDIR)$(BINDIR)
64 + for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/auxiliary; done
65 + for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(BINDIR); done
66 + for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(BINDIR); done
70 diff -Nur grace-5.1.9.orig/doc/Makefile grace-5.1.9/doc/Makefile
71 --- grace-5.1.9.orig/doc/Makefile Sat Jun 22 13:40:21 2002
72 +++ grace-5.1.9/doc/Makefile Sun Aug 11 01:15:28 2002
74 $(RM) $(DVIDOCS) $(PSDOCS) $(PDFDOCS) $(HTMLDOCS)
76 install : $(HTMLS) $(HTMLDOCS) $(DVIDOCS) $(TUTDATA) $(MANPAGES)
77 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/doc
78 - for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/doc; done
79 - cd $(DESTDIR)$(GRACE_HOME)/doc; \
80 - for i in $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACEMAN) $$i; done
81 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/doc $(DESTDIR)$(MANDIR)/man1
82 + for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/doc; done
83 + install $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
84 + for i in $(MANLINKS); do echo ".so $(GRACEMAN)" > $(DESTDIR)$(MANDIR)/man1/$$i; done
86 $(DESTDIR)$(GRACE_HOME)/doc/grace.1 : $(MANPAGES)
88 diff -Nur grace-5.1.9.orig/examples/Makefile grace-5.1.9/examples/Makefile
89 --- grace-5.1.9.orig/examples/Makefile Sat Jun 22 13:40:21 2002
90 +++ grace-5.1.9/examples/Makefile Sun Aug 11 01:16:12 2002
94 install : $(EXAMPLES) $(DOTEST)
95 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/examples
96 - for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/examples; done
97 - $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
98 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/examples
99 + for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/examples; done
100 + $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(DATADIR)/grace/examples/$(DOTEST)
104 diff -Nur grace-5.1.9.orig/fonts/Makefile grace-5.1.9/fonts/Makefile
105 --- grace-5.1.9.orig/fonts/Makefile Sat Jun 22 13:40:21 2002
106 +++ grace-5.1.9/fonts/Makefile Sun Aug 11 01:17:21 2002
110 install : $(FONTS) $(AFMS) $(ENCODINGS)
111 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts
112 - $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(GRACE_HOME)/fonts
113 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts/type1
114 - for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/type1; done
115 - for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/type1; done
116 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts/enc
117 - for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/enc; done
118 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts
119 + $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(DATADIR)/grace/fonts
120 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/type1
121 + for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
122 + for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
123 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/enc
124 + for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/enc; done
128 diff -Nur grace-5.1.9.orig/grace_np/Makefile grace-5.1.9/grace_np/Makefile
129 --- grace-5.1.9.orig/grace_np/Makefile Sat Jun 22 13:40:21 2002
130 +++ grace-5.1.9/grace_np/Makefile Sun Aug 11 01:18:07 2002
132 testf_np$(O) : $(LIB)
135 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/lib
136 - $(INSTALL_DATA) $(LIB) $(DESTDIR)$(GRACE_HOME)/lib/$(LIB)
137 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/include
138 - $(INSTALL_DATA) grace_np.h $(DESTDIR)$(GRACE_HOME)/include/grace_np.h
139 + $(MKINSTALLDIRS) $(DESTDIR)$(LIBDIR)/grace
140 + $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/grace/$(LIB)
141 + $(MKINSTALLDIRS) $(DESTDIR)$(INCLUDEDIR)
142 + $(INSTALL_DATA) grace_np.h $(DESTDIR)$(INCLUDEDIR)/grace_np.h
144 $(DESTDIR)$(GRACE_HOME)/lib/$(LIB) : $(LIB)
146 diff -Nur grace-5.1.9.orig/grconvert/Makefile grace-5.1.9/grconvert/Makefile
147 --- grace-5.1.9.orig/grconvert/Makefile Sat Jun 22 13:40:21 2002
148 +++ grace-5.1.9/grconvert/Makefile Sun Aug 11 01:18:26 2002
150 $(RM) $(PROG) $(OBJS)
153 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
154 - $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(GRACE_HOME)/bin/$(PROG)
155 + $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
156 + $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(BINDIR)/$(PROG)
160 diff -Nur grace-5.1.9.orig/src/Makefile grace-5.1.9/src/Makefile
161 --- grace-5.1.9.orig/src/Makefile Sat Jun 22 13:40:21 2002
162 +++ grace-5.1.9/src/Makefile Sun Aug 11 01:19:09 2002
167 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
168 - $(INSTALL_PROGRAM) -s $(GRACE) $(DESTDIR)$(GRACE_HOME)/bin/$(GRACE)
169 - cd $(DESTDIR)$(GRACE_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
170 + $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
171 + $(INSTALL_PROGRAM) $(GRACE) $(DESTDIR)$(BINDIR)/$(GRACE)
172 + cd $(DESTDIR)$(BINDIR); $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
176 diff -Nur grace-5.1.9.orig/templates/Makefile grace-5.1.9/templates/Makefile
177 --- grace-5.1.9.orig/templates/Makefile Sat Jun 22 13:40:21 2002
178 +++ grace-5.1.9/templates/Makefile Sun Aug 11 01:19:55 2002
182 install : $(DEFAULT_AGR)
183 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/templates
184 - @if test -f $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR); then \
185 - echo " $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR) exists"; \
186 - echo " Installing only $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR).sample"; \
187 - $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR).sample; \
188 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/templates
189 + @if test -f $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR); then \
190 + echo " $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR) exists"; \
191 + echo " Installing only $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR).sample"; \
192 + $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR).sample; \
194 - $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR); \
195 + $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR); \