File maxima-fix-DESTDIR.patch of Package maxima

Overview Repositories Revisions Requests Users Attributes Meta

File maxima-fix-DESTDIR.patch of Package maxima (Revision 6b3cd969f499483eb2f8081ea68b861b)

Currently displaying revision 6b3cd969f499483eb2f8081ea68b861b , Show latest

commit 2e8c84839a18bdff85e8e7e266591977fb1b84f2
Author: Rupert Swarbrick <rswarbrick@gmail.com>
Date:   Sun Sep 8 15:55:18 2013 +0100

Fix missing DESTDIR in Makefile.am's
    
    Pointed out by Rex Dieter, I accidentally broke the DESTDIR support
    for clisp and scl. This fixes that mistake, and also adds destdir to
    the extradocinstall target in the top-level Makefile.am. Probably that
    only ever gets run on Windows, so DESTDIR is never set, but we may as
    well be consistent.

diff --git a/Makefile.am b/Makefile.am
index d11565a..ecde623 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,10 @@ EXTRA_DIST = \
 include common.mk
 
 extradocinstall:
-	test -d "$(docdir)" || mkdir -p "$(docdir)"
+	test -d "$(DESTDIR)$(docdir)" || mkdir -p "$(DESTDIR)$(docdir)"
 	for file in AUTHORS COPYING INSTALL README README.lisps ; \
             do \
-            $(INSTALL_DATA) $$file "$(docdir)" ; \
+            $(INSTALL_DATA) $$file "$(DESTDIR)$(docdir)" ; \
             done
 
 $(distdir).tar.gz: Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 6865ddd..e8e866c 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,9 +108,9 @@ 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@"
+	$(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
@@ -204,9 +204,9 @@ 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@"
+	$(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

commit 76fd2a4c8e7a9ec7e2a75a6d1ce9a82866ccd030
Author: Rupert Swarbrick <rswarbrick@gmail.com>
Date:   Sun Sep 8 16:08:45 2013 +0100

Also use DESTDIR for mkinstalldirs
    
    Predictably, I missed a line. With this change, I can install sensibly
    with a Maxima configured for clisp and scl to a directory chosen by
    DESTDIR. Phew.

diff --git a/src/Makefile.am b/src/Makefile.am
index e8e866c..8683060 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,7 @@ clispexeflag =
 WEIRD_INSTALL_TARGETS += install-clisp-copy
 WEIRD_UNINSTALL_TARGETS += uninstall-clisp-copy
 install-clisp-copy:
-	$(mkinstalldirs) $(clisplibdir)
+	$(mkinstalldirs) $(DESTDIR)$(clisplibdir)
 	$(INSTALL_PROGRAM) @CLISP_RUNTIME_PATH@ "$(DESTDIR)$(clisplibdir)/@CLISP_RUNTIME@"
 uninstall-clisp-copy:
 	rm -f "$(DESTDIR)$(clisplibdir)/@CLISP_RUNTIME@"
@@ -203,7 +203,7 @@ binary-scl/maxima.core:
 WEIRD_INSTALL_TARGETS += install-scl-copy
 WEIRD_UNINSTALL_TARGETS += uninstall-scl-copy
 install-scl-copy:
-	$(mkinstalldirs) $(scllibdir)
+	$(mkinstalldirs) $(DESTDIR)$(scllibdir)
 	$(INSTALL_PROGRAM) @SCL_RUNTIME_PATH@ "$(DESTDIR)$(scllibdir)/@SCL_RUNTIME@"
 uninstall-scl-copy:
 	rm -f "$(DESTDIR)$(scllibdir)/@SCL_RUNTIME@"

Places

File maxima-fix-DESTDIR.patch of Package maxima (Revision 6b3cd969f499483eb2f8081ea68b861b)

Places