rpms/Macaulay2/devel Macaulay2-0.9.95-DESTDIR.patch, NONE, 1.1 Macaulay2.spec, 1.28, 1.29 Macaulay2-0.9.95-infodir.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4565

Modified Files:
	Macaulay2.spec 
Added Files:
	Macaulay2-0.9.95-DESTDIR.patch 
Removed Files:
	Macaulay2-0.9.95-infodir.patch 
Log Message:
missing DESTDIR patch


Macaulay2-0.9.95-DESTDIR.patch:

--- NEW FILE Macaulay2-0.9.95-DESTDIR.patch ---
--- Macaulay2-0.9.95/include/config.Makefile.in.DESTDIR	2006-12-18 09:17:36.000000000 -0600
+++ Macaulay2-0.9.95/include/config.Makefile.in	2006-12-18 09:42:47.000000000 -0600
@@ -103,8 +103,8 @@
 # this might have to get changed manually, but hopefully not:
 MAINPACKAGE = Core
 
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+prefix = $(DESTDIR)@prefix@
+exec_prefix = $(DESTDIR)@exec_prefix@
 
 ifeq "$(ENCAP)" "yes"
 encapdir = $(prefix)/$(package)
@@ -125,27 +125,11 @@
 # in autoconf >= 2.60, @datadir@ is replaced by ${datarootdir}, so we need to get its value here:
 datarootdir = @datarootdir@
 
-ifeq ($(findstring $(prefix), at infodir@),)
-$(error expected infodir @infodir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at bindir@),)
-$(error expected bindir @bindir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at datadir@),)
-$(error expected datadir @datadir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at libdir@),)
-$(error expected libdir @libdir@ to begin with $(prefix))
-endif
-ifeq ($(findstring $(prefix), at mandir@),)
-$(error expected mandir @mandir@ to begin with $(prefix))
-endif
-
-infoRelDir = $(subst $(prefix)/,, at infodir@)
-binRelDir = $(subst $(prefix)/,, at bindir@)
-dataRelDir = $(subst $(prefix)/,, at datadir@)
-libRelDir = $(subst $(prefix)/,, at libdir@)
-manRelDir = $(subst $(prefix)/,, at mandir@)
+infoRelDir = $(subst $(prefix)/,,$(DESTDIR)@infodir@)
+binRelDir = $(subst $(prefix)/,,$(DESTDIR)@bindir@)
+dataRelDir = $(subst $(prefix)/,,$(DESTDIR)@datadir@)
+libRelDir = $(subst $(prefix)/,,$(DESTDIR)@libdir@)
+manRelDir = $(subst $(prefix)/,,$(DESTDIR)@mandir@)
 man1RelDir = $(manRelDir)/man1
 man3RelDir = $(manRelDir)/man3
 emacsRelDir = $(dataRelDir)/emacs/site-lisp


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Macaulay2.spec	18 Dec 2006 21:31:52 -0000	1.28
+++ Macaulay2.spec	18 Dec 2006 21:51:13 -0000	1.29
@@ -7,7 +7,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.95
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Group:   Applications/Engineering


--- Macaulay2-0.9.95-infodir.patch DELETED ---