[maxima] support DESTDIR (regression from 5.30.0)
Rex Dieter
rdieter at fedoraproject.org
Sun Sep 8 12:51:07 UTC 2013
commit 5b01f3709b81d198de74296e17c03990fd9da3d9
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Sep 8 07:50:45 2013 -0500
support DESTDIR (regression from 5.30.0)
maxima-5.31.0-DESTDIR.patch | 62 +++++++++++++++++++++++++++++++++++++++++++
maxima.spec | 4 +++
2 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/maxima-5.31.0-DESTDIR.patch b/maxima-5.31.0-DESTDIR.patch
new file mode 100644
index 0000000..d58cd14
--- /dev/null
+++ b/maxima-5.31.0-DESTDIR.patch
@@ -0,0 +1,62 @@
+diff -up maxima-5.31.0/src/Makefile.am.DESTDIR maxima-5.31.0/src/Makefile.am
+--- maxima-5.31.0/src/Makefile.am.DESTDIR 2013-08-29 22:45:02.000000000 -0500
++++ maxima-5.31.0/src/Makefile.am 2013-09-08 07:40:00.573280555 -0500
+@@ -107,10 +107,10 @@ clispexeflag =
+ WEIRD_INSTALL_TARGETS += install-clisp-copy
+ WEIRD_UNINSTALL_TARGETS += uninstall-clisp-copy
+ install-clisp-copy:
+- $(mkinstalldirs) $(clisplibdir)
+- $(INSTALL_PROGRAM) @CLISP_RUNTIME_PATH@ "$(clisplibdir)/@CLISP_RUNTIME@"
++ $(mkinstalldirs) $(DESTDIR)$(clisplibdir)
++ $(INSTALL_PROGRAM) @CLISP_RUNTIME_PATH@ "$(DESTDIR)$(clisplibdir)/@CLISP_RUNTIME@"
+ uninstall-clisp-copy:
+- rm -f "$(clisplibdir)/@CLISP_RUNTIME@"
++ rm -f "$(DESTDIR)$(clisplibdir)/@CLISP_RUNTIME@"
+ endif
+
+ EXECUTECLISP = $(CLISP_NAME) -norc -q -x
+@@ -203,10 +203,10 @@ binary-scl/maxima.core:
+ WEIRD_INSTALL_TARGETS += install-scl-copy
+ WEIRD_UNINSTALL_TARGETS += uninstall-scl-copy
+ install-scl-copy:
+- $(mkinstalldirs) $(scllibdir)
+- $(INSTALL_PROGRAM) @SCL_RUNTIME_PATH@ "$(scllibdir)/@SCL_RUNTIME@"
++ $(mkinstalldirs) $(DESTDIR)$(scllibdir)
++ $(INSTALL_PROGRAM) @SCL_RUNTIME_PATH@ "$(DESTDIR)$(scllibdir)/@SCL_RUNTIME@"
+ uninstall-scl-copy:
+- rm -f "$(scllibdir)/@SCL_RUNTIME@"
++ rm -f "$(DESTDIR)$(scllibdir)/@SCL_RUNTIME@"
+
+ clean-scl:
+ rm -rf binary-scl
+diff -up maxima-5.31.0/src/Makefile.in.DESTDIR maxima-5.31.0/src/Makefile.in
+--- maxima-5.31.0/src/Makefile.in.DESTDIR 2013-09-02 22:14:29.000000000 -0500
++++ maxima-5.31.0/src/Makefile.in 2013-09-08 07:41:15.965474658 -0500
+@@ -998,10 +998,10 @@ uninstall-hook: $(WEIRD_UNINSTALL_TARGET
+ bd_%:
+ $(MKDIR_P) $(addprefix $(subst bd_,binary-,$@),$(binary_subdirs))
+ @CLISP_EXEC_FALSE@@CLISP_TRUE at install-clisp-copy:
+- at CLISP_EXEC_FALSE@@CLISP_TRUE@ $(mkinstalldirs) $(clisplibdir)
+- at CLISP_EXEC_FALSE@@CLISP_TRUE@ $(INSTALL_PROGRAM) @CLISP_RUNTIME_PATH@ "$(clisplibdir)/@CLISP_RUNTIME@"
++ at CLISP_EXEC_FALSE@@CLISP_TRUE@ $(mkinstalldirs) $(DESTDIR)$(clisplibdir)
++ at CLISP_EXEC_FALSE@@CLISP_TRUE@ $(INSTALL_PROGRAM) @CLISP_RUNTIME_PATH@ "$(DESTDIR)$(clisplibdir)/@CLISP_RUNTIME@"
+ @CLISP_EXEC_FALSE@@CLISP_TRUE at uninstall-clisp-copy:
+- at CLISP_EXEC_FALSE@@CLISP_TRUE@ rm -f "$(clisplibdir)/@CLISP_RUNTIME@"
++ at CLISP_EXEC_FALSE@@CLISP_TRUE@ rm -f "$(DESTDIR)$(clisplibdir)/@CLISP_RUNTIME@"
+
+ @CLISP_TRUE at clisp: $(CLISP_MAXIMA)
+
+@@ -1039,10 +1039,10 @@ bd_%:
+ @SCL_TRUE@ (echo '(progn $(LOADDEFSYSTEM) $(DEFSYSTEMCOMPILE))' | $(EXECUTESCL)) && \
+ @SCL_TRUE@ (echo '(progn $(LOADDEFSYSTEM) $(DEFSYSTEMLOAD) (ext:save-lisp "binary-scl/maxima.core"))' | $(EXECUTESCL))
+ @SCL_TRUE at install-scl-copy:
+- at SCL_TRUE@ $(mkinstalldirs) $(scllibdir)
+- at SCL_TRUE@ $(INSTALL_PROGRAM) @SCL_RUNTIME_PATH@ "$(scllibdir)/@SCL_RUNTIME@"
++ at SCL_TRUE@ $(mkinstalldirs) $(DESTDIR)$(scllibdir)
++ at SCL_TRUE@ $(INSTALL_PROGRAM) @SCL_RUNTIME_PATH@ "$(DESTDIR)$(scllibdir)/@SCL_RUNTIME@"
+ @SCL_TRUE at uninstall-scl-copy:
+- at SCL_TRUE@ rm -f "$(scllibdir)/@SCL_RUNTIME@"
++ at SCL_TRUE@ rm -f "$(DESTDIR)$(scllibdir)/@SCL_RUNTIME@"
+
+ @SCL_TRUE at clean-scl:
+ @SCL_TRUE@ rm -rf binary-scl
diff --git a/maxima.spec b/maxima.spec
index 07be10e..4d952d7 100644
--- a/maxima.spec
+++ b/maxima.spec
@@ -23,6 +23,9 @@ Patch50: maxima-5.28.0-clisp-noreadline.patch
# Build the fasl while building the executable to avoid double initialization
Patch51: maxima-5.30.0-build-fasl.patch
+# support DESTDIR (regression from 5.30.0)
+Patch52: maxima-5.31.0-DESTDIR.patch
+
## upstream patches
%define maxima_ver %{version}%{?beta}
@@ -222,6 +225,7 @@ Maxima compiled with Embeddable Common-Lisp (ecl).
%patch50 -p1 -b .clisp-noreadline
%patch51 -p1 -b .build-fasl
+%patch52 -p1 -b .DESTDIR
# Extra docs
install -p -m644 %{SOURCE10} .
More information about the scm-commits
mailing list