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 --- grace-5.1.25/doc/Makefile.orig 2018-05-13 21:39:05.260435364 +0200
71 +++ grace-5.1.25/doc/Makefile 2018-05-13 21:40:37.127100982 +0200
73 $(RM) $(DVIDOCS) $(PSDOCS) $(PDFDOCS) $(HTMLDOCS)
75 install : $(HTMLS) $(HTMLDOCS) $(PDFDOCS) $(TUTDATA) $(MANPAGES)
76 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/doc
77 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/doc $(DESTDIR)$(MANDIR)/man1
78 for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/doc; done
79 + install $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
80 + for i in $(MANLINKS); do echo ".so $(GRACEMAN)" > $(DESTDIR)$(MANDIR)/man1/$$i; done
82 $(DESTDIR)$(GRACE_HOME)/doc/grace.1 : $(MANPAGES)
84 diff -Nur grace-5.1.9.orig/examples/Makefile grace-5.1.9/examples/Makefile
85 --- grace-5.1.9.orig/examples/Makefile Sat Jun 22 13:40:21 2002
86 +++ grace-5.1.9/examples/Makefile Sun Aug 11 01:16:12 2002
90 install : $(EXAMPLES) $(DOTEST)
91 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/examples
92 - for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/examples; done
93 - $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
94 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/examples
95 + for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/examples; done
96 + $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(DATADIR)/grace/examples/$(DOTEST)
100 diff -Nur grace-5.1.9.orig/fonts/Makefile grace-5.1.9/fonts/Makefile
101 --- grace-5.1.9.orig/fonts/Makefile Sat Jun 22 13:40:21 2002
102 +++ grace-5.1.9/fonts/Makefile Sun Aug 11 01:17:21 2002
106 install : $(FONTS) $(AFMS) $(ENCODINGS)
107 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts
108 - $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(GRACE_HOME)/fonts
109 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts/type1
110 - for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/type1; done
111 - for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/type1; done
112 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts/enc
113 - for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/enc; done
114 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts
115 + $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(DATADIR)/grace/fonts
116 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/type1
117 + for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
118 + for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
119 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/enc
120 + for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/enc; done
124 diff -Nur grace-5.1.9.orig/grace_np/Makefile grace-5.1.9/grace_np/Makefile
125 --- grace-5.1.9.orig/grace_np/Makefile Sat Jun 22 13:40:21 2002
126 +++ grace-5.1.9/grace_np/Makefile Sun Aug 11 01:18:07 2002
128 testf_np$(O) : $(LIB)
131 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/lib
132 - $(INSTALL_DATA) $(LIB) $(DESTDIR)$(GRACE_HOME)/lib/$(LIB)
133 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/include
134 - $(INSTALL_DATA) grace_np.h $(DESTDIR)$(GRACE_HOME)/include/grace_np.h
135 + $(MKINSTALLDIRS) $(DESTDIR)$(LIBDIR)/grace
136 + $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/grace/$(LIB)
137 + $(MKINSTALLDIRS) $(DESTDIR)$(INCLUDEDIR)
138 + $(INSTALL_DATA) grace_np.h $(DESTDIR)$(INCLUDEDIR)/grace_np.h
140 $(DESTDIR)$(GRACE_HOME)/lib/$(LIB) : $(LIB)
142 diff -Nur grace-5.1.9.orig/grconvert/Makefile grace-5.1.9/grconvert/Makefile
143 --- grace-5.1.9.orig/grconvert/Makefile Sat Jun 22 13:40:21 2002
144 +++ grace-5.1.9/grconvert/Makefile Sun Aug 11 01:18:26 2002
146 $(RM) $(PROG) $(OBJS)
149 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
150 - $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(GRACE_HOME)/bin/$(PROG)
151 + $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
152 + $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(BINDIR)/$(PROG)
156 diff -Nur grace-5.1.9.orig/src/Makefile grace-5.1.9/src/Makefile
157 --- grace-5.1.9.orig/src/Makefile Sat Jun 22 13:40:21 2002
158 +++ grace-5.1.9/src/Makefile Sun Aug 11 01:19:09 2002
163 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
164 - $(INSTALL_PROGRAM) -s $(GRACE) $(DESTDIR)$(GRACE_HOME)/bin/$(GRACE)
165 - cd $(DESTDIR)$(GRACE_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
166 + $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
167 + $(INSTALL_PROGRAM) $(GRACE) $(DESTDIR)$(BINDIR)/$(GRACE)
168 + cd $(DESTDIR)$(BINDIR); $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
172 diff -Nur grace-5.1.9.orig/templates/Makefile grace-5.1.9/templates/Makefile
173 --- grace-5.1.9.orig/templates/Makefile Sat Jun 22 13:40:21 2002
174 +++ grace-5.1.9/templates/Makefile Sun Aug 11 01:19:55 2002
178 install : $(DEFAULT_AGR)
179 - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/templates
180 - @if test -f $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR); then \
181 - echo " $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR) exists"; \
182 - echo " Installing only $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR).sample"; \
183 - $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR).sample; \
184 + $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/templates
185 + @if test -f $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR); then \
186 + echo " $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR) exists"; \
187 + echo " Installing only $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR).sample"; \
188 + $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR).sample; \
190 - $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR); \
191 + $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR); \