+++ /dev/null
-diff -urN grace-5.1.2/Makefile grace-DESTDIR/Makefile
---- grace-5.1.2/Makefile Wed Aug 2 22:10:50 2000
-+++ grace-DESTDIR/Makefile Tue Nov 28 16:43:13 2000
-@@ -13,15 +13,9 @@
-
- install : subdirs
- @set -e; for i in $(SUBDIRS); do (cd $$i; $(MAKE) install) || exit 1; done
-- $(MKINSTALLDIRS) $(GRACE_HOME)
-- @if test -f $(GRACE_HOME)/gracerc; then \
-- echo " $(GRACE_HOME)/gracerc exists"; \
-- echo " Installing only $(GRACE_HOME)/gracerc.sample"; \
-- $(INSTALL_DATA) gracerc $(GRACE_HOME)/gracerc.sample; \
-- else \
-- $(INSTALL_DATA) gracerc $(GRACE_HOME); \
-- fi
-- $(INSTALL_DATA) gracerc.user $(GRACE_HOME)
-+ $(MKINSTALLDIRS) $(DESTDIR)/etc/grace
-+ $(INSTALL_DATA) gracerc $(DESTDIR)/etc/grace/gracerc
-+ $(INSTALL_DATA) gracerc.user $(DESTDIR)/etc/grace/gracerc.user
-
- tests : subdirs
- @set -e; for i in $(SUBDIRS); do (cd $$i; $(MAKE) tests) || exit 1; done
-diff -urN grace-5.1.2/ac-tools/Make.conf.in grace-DESTDIR/ac-tools/Make.conf.in
---- grace-5.1.2/ac-tools/Make.conf.in Sun Feb 20 00:49:12 2000
-+++ grace-DESTDIR/ac-tools/Make.conf.in Tue Nov 28 16:43:13 2000
-@@ -22,6 +22,21 @@
- # Location of the Grace home
- GRACE_HOME=@GRACE_HOME@
-
-+# Data Dir
-+DATADIR=@datadir@
-+
-+# Man pages
-+MANDIR=@mandir@
-+
-+# LIB DIR
-+LIBDIR=@libdir@
-+
-+# INCLUDE DIR
-+INCLUDEDIR=@includedir@
-+
-+# BIN DIR
-+BINDIR=@bindir@
-+
- # Relocatable that contains alloca()
- ALLOCA=@ALLOCA@
-
-diff -urN grace-5.1.2/auxiliary/Makefile grace-DESTDIR/auxiliary/Makefile
---- grace-5.1.2/auxiliary/Makefile Sat Dec 25 23:20:47 1999
-+++ grace-DESTDIR/auxiliary/Makefile Tue Nov 28 16:43:13 2000
-@@ -24,9 +24,9 @@
- $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS)
-
- install : $(AUXILIARIES) $(PROGRAMS)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary
-- for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done
-- for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(GRACE_HOME)/bin; done
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/auxiliary
-+ for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/auxiliary; done
-+ for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(BINDIR)/; done
-
- tests : dummy
-
-diff -urN grace-5.1.2/doc/Makefile grace-DESTDIR/doc/Makefile
---- grace-5.1.2/doc/Makefile Mon Aug 21 21:53:19 2000
-+++ grace-DESTDIR/doc/Makefile Tue Nov 28 16:43:13 2000
-@@ -82,11 +82,10 @@
- $(RM) $(DVIDOCS) $(PSDOCS) $(PDFDOCS) $(HTMLDOCS)
-
- install : $(HTMLS) $(HTMLDOCS) $(DVIDOCS) $(TUTDATA) $(MANPAGES)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/doc
-- for i in $?; do $(INSTALL_DATA) $$i $(GRACE_HOME)/doc; done
-- cd $(GRACE_HOME)/doc; \
-- for i in $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACEMAN) $$i; done
--
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/doc/
-+ for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/doc/; done
-+ $(MKINSTALLDIRS) $(DESTDIR)$(MANDIR)/man1
-+ $(INSTALL_DATA) $(GRACEMAN) $(DESTDIR)$(MANDIR)/man1/$(GRACEMAN)
- links : $(MANPAGES)
- $(MKINSTALLDIRS) $(PREFIX)/man
- $(MKINSTALLDIRS) $(PREFIX)/man/man1
-diff -urN grace-5.1.2/examples/Makefile grace-DESTDIR/examples/Makefile
---- grace-5.1.2/examples/Makefile Mon Jun 26 21:19:01 2000
-+++ grace-DESTDIR/examples/Makefile Tue Nov 28 16:43:13 2000
-@@ -31,9 +31,9 @@
- devclean : dummy
-
- install : $(EXAMPLES) $(DOTEST)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/examples
-- for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done
-- $(INSTALL_PROGRAM) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/examples
-+ for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/examples; done
-+ $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(DATADIR)/grace/examples/$(DOTEST)
-
- links : dummy
-
-diff -urN grace-5.1.2/fonts/Makefile grace-DESTDIR/fonts/Makefile
---- grace-5.1.2/fonts/Makefile Wed Mar 29 02:34:37 2000
-+++ grace-DESTDIR/fonts/Makefile Tue Nov 28 16:43:13 2000
-@@ -54,13 +54,13 @@
- devclean : dummy
-
- install : $(FONTS) $(AFMS) $(ENCODINGS)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/fonts
-- $(INSTALL_DATA) $(FONTDATABASE) $(GRACE_HOME)/fonts
-- $(MKINSTALLDIRS) $(GRACE_HOME)/fonts/type1
-- for i in $(FONTS); do $(INSTALL_DATA) $$i $(GRACE_HOME)/fonts/type1; done
-- for i in $(AFMS); do $(INSTALL_DATA) $$i $(GRACE_HOME)/fonts/type1; done
-- $(MKINSTALLDIRS) $(GRACE_HOME)/fonts/enc
-- for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(GRACE_HOME)/fonts/enc; done
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts
-+ $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(DATADIR)/grace/fonts
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/type1
-+ for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
-+ for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/enc
-+ for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/enc; done
-
- links : dummy
-
-diff -urN grace-5.1.2/grace_np/Makefile grace-DESTDIR/grace_np/Makefile
---- grace-5.1.2/grace_np/Makefile Sun Apr 2 14:14:57 2000
-+++ grace-DESTDIR/grace_np/Makefile Tue Nov 28 16:43:13 2000
-@@ -45,10 +45,10 @@
- testf_np$(O) : $(LIB)
-
- install : $(LIB)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/lib
-- $(INSTALL_DATA) $(LIB) $(GRACE_HOME)/lib/$(LIB)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/include
-- $(INSTALL_DATA) grace_np.h $(GRACE_HOME)/include/grace_np.h
-+ $(MKINSTALLDIRS) $(DESTDIR)$(LIBDIR)/grace
-+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/grace/$(LIB)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(INCLUDEDIR)
-+ $(INSTALL_DATA) grace_np.h $(DESTDIR)$(INCLUDEDIR)/grace_np.h
-
- links : $(GRACE_HOME)/lib/$(LIB) $(GRACE_HOME)/include/grace_np.h
- $(MKINSTALLDIRS) $(PREFIX)/lib
-diff -urN grace-5.1.2/grconvert/Makefile grace-DESTDIR/grconvert/Makefile
---- grace-5.1.2/grconvert/Makefile Sat Sep 11 01:31:49 1999
-+++ grace-DESTDIR/grconvert/Makefile Tue Nov 28 16:43:13 2000
-@@ -41,8 +41,8 @@
- $(RM) $(PROG) $(OBJS)
-
- install : $(PROG)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/bin
-- $(INSTALL_PROGRAM) -s $(PROG) $(GRACE_HOME)/bin/$(PROG)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
-+ $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(BINDIR)/$(PROG)
-
- dummy :
-
-diff -urN grace-5.1.2/src/Makefile grace-DESTDIR/src/Makefile
---- grace-5.1.2/src/Makefile Wed May 17 19:01:33 2000
-+++ grace-DESTDIR/src/Makefile Tue Nov 28 16:43:13 2000
-@@ -59,9 +59,9 @@
-
-
- install : $(GRACE)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/bin
-- $(INSTALL_PROGRAM) -s $(GRACE) $(GRACE_HOME)/bin/$(GRACE)
-- cd $(GRACE_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
-+ $(INSTALL_PROGRAM) -s $(GRACE) $(DESTDIR)$(BINDIR)/$(GRACE)
-+ cd $(DESTDIR)$(BINDIR); $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
-
- tests : dummy
-
-diff -urN grace-5.1.2/templates/Makefile grace-DESTDIR/templates/Makefile
---- grace-5.1.2/templates/Makefile Thu May 20 23:57:28 1999
-+++ grace-DESTDIR/templates/Makefile Tue Nov 28 16:43:13 2000
-@@ -20,14 +20,8 @@
- devclean : dummy
-
- install : $(DEFAULT_AGR)
-- $(MKINSTALLDIRS) $(GRACE_HOME)/templates
-- @if test -f $(GRACE_HOME)/templates/$(DEFAULT_AGR); then \
-- echo " $(GRACE_HOME)/templates/$(DEFAULT_AGR) exists"; \
-- echo " Installing only $(GRACE_HOME)/templates/$(DEFAULT_AGR).sample"; \
-- $(INSTALL_DATA) $(DEFAULT_AGR) $(GRACE_HOME)/templates/$(DEFAULT_AGR).sample; \
-- else \
-- $(INSTALL_DATA) $(DEFAULT_AGR) $(GRACE_HOME)/templates/$(DEFAULT_AGR); \
-- fi
-+ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/templates
-+ $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR);
-
- links : dummy
-
--- /dev/null
+diff -Nur grace-5.1.9.orig/Makefile grace-5.1.9/Makefile
+--- grace-5.1.9.orig/Makefile Sat Jun 22 13:40:18 2002
++++ grace-5.1.9/Makefile Sun Aug 11 01:09:39 2002
+@@ -13,15 +13,15 @@
+
+ install : subdirs
+ @set -e; for i in $(SUBDIRS); do (cd $$i; $(MAKE) install) || exit 1; done
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)
+- @if test -f $(DESTDIR)$(GRACE_HOME)/gracerc; then \
+- echo " $(DESTDIR)$(GRACE_HOME)/gracerc exists"; \
+- echo " Installing only $(DESTDIR)$(GRACE_HOME)/gracerc.sample"; \
+- $(INSTALL_DATA) gracerc $(DESTDIR)$(GRACE_HOME)/gracerc.sample; \
++ $(MKINSTALLDIRS) $(DESTDIR)/etc/grace
++ @if test -f $(DESTDIR)/etc/grace/gracerc; then \
++ echo " $(DESTDIR)/etc/grace/gracerc exists"; \
++ echo " Installing only $(DESTDIR)/etc/grace/gracerc.sample"; \
++ $(INSTALL_DATA) gracerc $(DESTDIR)/etc/grace/gracerc.sample; \
+ else \
+- $(INSTALL_DATA) gracerc $(DESTDIR)$(GRACE_HOME); \
++ $(INSTALL_DATA) gracerc $(DESTDIR)/etc/grace; \
+ fi
+- $(INSTALL_DATA) gracerc.user $(DESTDIR)$(GRACE_HOME)
++ $(INSTALL_DATA) gracerc.user $(DESTDIR)/etc/grace
+
+ tests : subdirs
+ @set -e; for i in $(SUBDIRS); do (cd $$i; $(MAKE) tests) || exit 1; done
+diff -Nur grace-5.1.9.orig/ac-tools/Make.conf.in grace-5.1.9/ac-tools/Make.conf.in
+--- grace-5.1.9.orig/ac-tools/Make.conf.in Sun Feb 20 01:49:12 2000
++++ grace-5.1.9/ac-tools/Make.conf.in Sun Aug 11 01:10:17 2002
+@@ -22,6 +22,21 @@
+ # Location of the Grace home
+ GRACE_HOME=@GRACE_HOME@
+
++# Data Dir
++DATADIR=@datadir@
++
++# Man pages
++MANDIR=@mandir@
++
++# LIB DIR
++LIBDIR=@libdir@
++
++# INCLUDE DIR
++INCLUDEDIR=@includedir@
++
++# BIN DIR
++BINDIR=@bindir@
++
+ # Relocatable that contains alloca()
+ ALLOCA=@ALLOCA@
+
+diff -Nur grace-5.1.9.orig/auxiliary/Makefile grace-5.1.9/auxiliary/Makefile
+--- grace-5.1.9.orig/auxiliary/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/auxiliary/Makefile Sun Aug 11 01:11:51 2002
+@@ -25,10 +25,10 @@
+ $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS)
+
+ install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary
+- for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/auxiliary; done
+- for i in $(PROGRAMS); do $(INSTALL_PROGRAM) -s $$i $(DESTDIR)$(GRACE_HOME)/bin; done
+- for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/auxiliary $(DESTDIR)$(BINDIR)
++ for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/auxiliary; done
++ for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(BINDIR); done
++ for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(BINDIR); done
+
+ tests : dummy
+
+diff -Nur grace-5.1.9.orig/doc/Makefile grace-5.1.9/doc/Makefile
+--- grace-5.1.9.orig/doc/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/doc/Makefile Sun Aug 11 01:15:28 2002
+@@ -85,10 +85,10 @@
+ $(RM) $(DVIDOCS) $(PSDOCS) $(PDFDOCS) $(HTMLDOCS)
+
+ install : $(HTMLS) $(HTMLDOCS) $(DVIDOCS) $(TUTDATA) $(MANPAGES)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/doc
+- for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/doc; done
+- cd $(DESTDIR)$(GRACE_HOME)/doc; \
+- for i in $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACEMAN) $$i; done
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/doc $(DESTDIR)$(MANDIR)/man1
++ for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/doc; done
++ install $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
++ for i in $(MANLINKS); do echo ".so $(GRACEMAN)" > $(DESTDIR)$(MANDIR)/man1/$$i; done
+
+ $(DESTDIR)$(GRACE_HOME)/doc/grace.1 : $(MANPAGES)
+ $(MAKE) install
+diff -Nur grace-5.1.9.orig/examples/Makefile grace-5.1.9/examples/Makefile
+--- grace-5.1.9.orig/examples/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/examples/Makefile Sun Aug 11 01:16:12 2002
+@@ -31,9 +31,9 @@
+ devclean : dummy
+
+ install : $(EXAMPLES) $(DOTEST)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/examples
+- for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/examples; done
+- $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/examples
++ for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/examples; done
++ $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(DATADIR)/grace/examples/$(DOTEST)
+
+ links : dummy
+
+diff -Nur grace-5.1.9.orig/fonts/Makefile grace-5.1.9/fonts/Makefile
+--- grace-5.1.9.orig/fonts/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/fonts/Makefile Sun Aug 11 01:17:21 2002
+@@ -54,13 +54,13 @@
+ devclean : dummy
+
+ install : $(FONTS) $(AFMS) $(ENCODINGS)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts
+- $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(GRACE_HOME)/fonts
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts/type1
+- for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/type1; done
+- for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/type1; done
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/fonts/enc
+- for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/fonts/enc; done
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts
++ $(INSTALL_DATA) $(FONTDATABASE) $(DESTDIR)$(DATADIR)/grace/fonts
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/type1
++ for i in $(FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
++ for i in $(AFMS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/type1; done
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/fonts/enc
++ for i in $(ENCODINGS); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/fonts/enc; done
+
+ links : dummy
+
+diff -Nur grace-5.1.9.orig/grace_np/Makefile grace-5.1.9/grace_np/Makefile
+--- grace-5.1.9.orig/grace_np/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/grace_np/Makefile Sun Aug 11 01:18:07 2002
+@@ -45,10 +45,10 @@
+ testf_np$(O) : $(LIB)
+
+ install : $(LIB)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/lib
+- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(GRACE_HOME)/lib/$(LIB)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/include
+- $(INSTALL_DATA) grace_np.h $(DESTDIR)$(GRACE_HOME)/include/grace_np.h
++ $(MKINSTALLDIRS) $(DESTDIR)$(LIBDIR)/grace
++ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/grace/$(LIB)
++ $(MKINSTALLDIRS) $(DESTDIR)$(INCLUDEDIR)
++ $(INSTALL_DATA) grace_np.h $(DESTDIR)$(INCLUDEDIR)/grace_np.h
+
+ $(DESTDIR)$(GRACE_HOME)/lib/$(LIB) : $(LIB)
+ $(MAKE) install
+diff -Nur grace-5.1.9.orig/grconvert/Makefile grace-5.1.9/grconvert/Makefile
+--- grace-5.1.9.orig/grconvert/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/grconvert/Makefile Sun Aug 11 01:18:26 2002
+@@ -41,8 +41,8 @@
+ $(RM) $(PROG) $(OBJS)
+
+ install : $(PROG)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
+- $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(GRACE_HOME)/bin/$(PROG)
++ $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
++ $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(BINDIR)/$(PROG)
+
+ dummy :
+
+diff -Nur grace-5.1.9.orig/src/Makefile grace-5.1.9/src/Makefile
+--- grace-5.1.9.orig/src/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/src/Makefile Sun Aug 11 01:19:09 2002
+@@ -59,9 +59,9 @@
+
+
+ install : $(GRACE)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
+- $(INSTALL_PROGRAM) -s $(GRACE) $(DESTDIR)$(GRACE_HOME)/bin/$(GRACE)
+- cd $(DESTDIR)$(GRACE_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
++ $(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
++ $(INSTALL_PROGRAM) $(GRACE) $(DESTDIR)$(BINDIR)/$(GRACE)
++ cd $(DESTDIR)$(BINDIR); $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
+
+ tests : dummy
+
+diff -Nur grace-5.1.9.orig/templates/Makefile grace-5.1.9/templates/Makefile
+--- grace-5.1.9.orig/templates/Makefile Sat Jun 22 13:40:21 2002
++++ grace-5.1.9/templates/Makefile Sun Aug 11 01:19:55 2002
+@@ -20,13 +20,13 @@
+ devclean : dummy
+
+ install : $(DEFAULT_AGR)
+- $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/templates
+- @if test -f $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR); then \
+- echo " $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR) exists"; \
+- echo " Installing only $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR).sample"; \
+- $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR).sample; \
++ $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/templates
++ @if test -f $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR); then \
++ echo " $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR) exists"; \
++ echo " Installing only $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR).sample"; \
++ $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR).sample; \
+ else \
+- $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(GRACE_HOME)/templates/$(DEFAULT_AGR); \
++ $(INSTALL_DATA) $(DEFAULT_AGR) $(DESTDIR)$(DATADIR)/grace/templates/$(DEFAULT_AGR); \
+ fi
+
+ links : dummy
+++ /dev/null
-diff -urN grace-5.1.2/configure grace-5.1.2-PDFlib/configure
---- grace-5.1.2/configure Sun Sep 10 14:14:00 2000
-+++ grace-5.1.2-PDFlib/configure Thu Dec 7 01:13:26 2000
-@@ -7738,8 +7738,8 @@
- pdf_library=-lpdf
- fi
-
-- echo $ac_n "checking "for PDFlib \>= 3.02"""... $ac_c" 1>&6
--echo "configure:7743: checking "for PDFlib \>= 3.02"" >&5
-+ echo $ac_n "checking "for PDFlib \>= 3.0"""... $ac_c" 1>&6
-+echo "configure:7743: checking "for PDFlib \>= 3.0"" >&5
- if eval "test \"`echo '$''{'acx_cv_pdflib'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7771,7 +7771,7 @@
- vlibn = 100*PDF_get_majorversion() + PDF_get_minorversion();
- vincn = 100*PDFLIB_MAJORVERSION + PDFLIB_MINORVERSION;
- vinc = PDFLIB_VERSIONSTRING;
-- if (strcmp(vinc, "3.02") < 0) {
-+ if (strcmp(vinc, "3.0") < 0) {
- exit(1);
- }
- if (vincn != vlibn) {
License: GPL
Group: Applications/Math
Source0: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/%{name}-%{version}.tar.gz
-Patch0: %{name}-DESTDIR.patch
+Patch0: %{name}-FHS.patch
Patch1: %{name}-home_etc.patch
-Patch2: %{name}-PDFlib.patch
-Patch3: %{name}-etc.patch
-Patch4: %{name}-fontsdir.patch
-Patch5: %{name}-ac25x.patch
+Patch2: %{name}-etc.patch
+Patch3: %{name}-fontsdir.patch
+Patch4: %{name}-ac25x.patch
URL: http://plasma-gate.weizmann.ac.il/Grace/
BuildRequires: XFree86-devel
BuildRequires: Xbae-devel
BuildRequires: libpng-devel >= 0.9.6
BuildRequires: libtiff-devel
BuildRequires: netcdf-devel >= 3.0
-BuildRequires: pdflib-devel >= 3.0
+BuildRequires: pdflib-devel >= 4.0.3
BuildRequires: t1lib-devel
Requires: ghostscript-fonts-std
Requires: libpng >= 0.9.6
-Requires: pdflib >= 3.0
+Requires: pdflib >= 4.0.3
Requires: zlib >= 1.0.3
Obsoletes: xmgr
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%prep
%setup -q
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
-#%patch2 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
cp -f ac-tools/configure.in .
%{__autoconf}
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
- CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
-%configure CPPFLAGS="$CPPFLAGS" \
+%configure \
--enable-grace-home=%{_datadir}/%{name} \
--enable-editres \
--enable-extra-incpath=$PKG_BUILD_DIR/include \
%{_datadir}/grace/doc
%{_datadir}/grace/examples
%dir %{_sysconfdir}/grace
-
%config(noreplace) %verify(not size, mtime, md5) %{_sysconfdir}/grace/*
%attr(755,root,root)%{_bindir}/*
+%{_mandir}/man1/*
%{_libdir}/grace
%{_includedir}/*
%dir %{_datadir}/grace
projects / packages / grace.git / commitdiff